Change: Initialize returns always object instance

pwlmaciejewski · Oct 17, 2012 · 3cfa500 · 3cfa500
1 parent f956ba9
commit 3cfa500
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/unterproto.js b/lib/unterproto.js
@@ -21,8 +21,8 @@
 		},
 
 		init: function () {
-			var res = this.initialize.apply(this, arguments); 
-			return res === undefined ? this : res;		
+			this.initialize.apply(this, arguments); 
+			return this;		
 		},
 
 		initialize: function () {},

diff --git a/test/testUnterproto.js b/test/testUnterproto.js
@@ -71,15 +71,15 @@
        assert.same(foo.bar, 'baz');    
      },
 
-     'return': function () {
+     'test if initialize returns something it should be ignored': function () {
        var o = { foo: 'bar' };
        var Foo = Proto.inherits({
          initialize: function () {
            return o;
          }
        });
        var foo = Foo.instance();
-       assert.same(foo, o, 'If initialize() returns something it should be also returned by instance()');
+       refute.same(foo, o);
      }
   });
 })();