Merge pull request #51 from creynders/fix_51

BUG: Singleton (backbone) instances resolved twice
GeppettoJS · Sep 1, 2014 · f767071 · f767071
2 parents 79e3c31 + 5018150
commit f767071
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/backbone.geppetto.js b/backbone.geppetto.js
@@ -124,10 +124,8 @@
 
         wireSingleton: function(key, clazz, wiring) {
 
-            var constructor = (clazz.prototype.initialize ? this._wrapConstructor(clazz, wiring) : clazz);
-
             this._mappings[key] = {
-                clazz: constructor,
+                clazz: clazz,
                 object: null,
                 type: TYPES.SINGLETON,
                 wiring: wiring

diff --git a/dist/backbone.geppetto.min.js b/dist/backbone.geppetto.min.js
diff --git a/specs/src/resolver-specs.js b/specs/src/resolver-specs.js
@@ -363,6 +363,24 @@ define([
                 throw (/no mapping found/);
             });
         });
+        describe('when used with Backbone objects', function(){
+            var clazzInstantiated;
+            var clazz = function(){
+                clazzInstantiated++;
+            };
+            var singleton = Backbone.Model.extend({
+                wiring : ['clazz']
+            });
+            beforeEach(function(){
+                clazzInstantiated=0;
+                resolver.wireClass('clazz', clazz);
+                resolver.wireSingleton('singleton', singleton);
+            });
+            it("should not resolve singleton dependencies twice, see #51", function(){
+                var actual = resolver.getObject('singleton');
+                expect(clazzInstantiated ).to.equal(1);
+            });
+        });
     });
 
 });