Merge pull request #61 from creynders/fix_54

Fix tests for #54 and add missing ones for full coverage

Author: geekdave

backbone.geppetto.js

@@ -85,11 +85,6 @@
             }
         },
 
-        createChildResolver: function() {
-            var child = new Resolver(this._context);
-            child.parent = this;
-            return child;
-        },
 
         getObject: function(key) {
             return this._retrieveFromCacheOrCreate(key, false);
@@ -185,12 +180,14 @@
 
         if (this.options.resolver) {
             this.resolver = this.options.resolver;
-        } else if (this.parentContext) {
-            this.resolver = this.parentContext.resolver.createChildResolver();
         } else if (!this.resolver) {
             this.resolver = new Resolver(this);
         }
 
+        if (this.parentContext) {
+            this.resolver.parent = this.parentContext.resolver;
+        }
+
         this.vent = {};
         _.extend(this.vent, Backbone.Events);
         this._contextId = _.uniqueId("Context");

specs/src/geppetto-specs.js

@@ -57,6 +57,13 @@ define([
                     expect(stub).to.have.been.calledOnce;
                 });
             });
+            it("should use the optionally provided resolver", function(){
+                var child = new Geppetto.Context({
+                    resolver: context.resolver
+                });
+                expect(child.resolver).to.equal(context.resolver);
+                child.destroy();
+            });
         });
 
         describe("when binding a context to a view that does not support dependency injection", function() {
@@ -723,6 +730,7 @@ define([
 
             it("should have an resolver which is a child resolver of the parent", function() {
                 expect(childContext.resolver.parent).to.equal(parentContext.resolver);
+                expect(childContext.resolver).not.to.equal(parentContext.resolver);
             });
 
         });
@@ -847,6 +855,7 @@ define([
             var context;
 
             beforeEach(function() {
+                
                 var viewDef = Backbone.View.extend();
                 view = new viewDef();
                 context = Geppetto.bindContext({

specs/src/resolver-specs.js

@@ -60,6 +60,15 @@ define([
             });
         });
         describe("when retrieving objects", function() {
+            it("should poll the parent resolver if no corresponding mapping was found", function(){
+                var value = {};
+                var child = new Geppetto.Context({
+                    parentContext : context
+                });
+                resolver.wireValue('value', value);
+                var actual = child.resolver.getObject('value');
+                expect(actual).to.equal(value);
+            });
             it("should throw an error if no corresponding mapping was found", function() {
                 expect(function() {
                     resolver.getObject('unregistered key');
@@ -338,31 +347,6 @@ define([
                 throw (/no mapping found/);
             });
         });
-        describe("when creating childResolvers", function() {
-            var parent, child;
-            var key1 = 'key 1';
-            var value1 = {};
-            var key2 = 'key 2';
-            var value2 = {};
-            beforeEach(function() {
-                parent = new Geppetto.Resolver(context);
-                parent.wireValue(key1, value1);
-                child = parent.createChildResolver();
-                child.wireValue(key2, value2);
-            });
-            it("should populate the child's parent property", function() {
-                expect(child.parent).to.equal(parent);
-            });
-            it("should allow to retrieve objects mapped to the parent through the child", function() {
-                expect(child.getObject(key1)).to.equal(value1);
-            });
-            it("should not allow to retrieve objects mapped to the child through the parent", function() {
-                expect(function() {
-                    parent.getObject(key2);
-                }).to.
-                throw (/no mapping found/);
-            });
-        });
         describe('when used with Backbone objects', function(){
             var clazzInstantiated;
             var clazz = function(){