From 776739299b698a965ef818eeda75d4eddd10c491 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Wed, 8 Feb 2012 16:12:11 -0800
Subject: fix($injector): instantiate returns instance, if non-object value
 returned from constructor

---
 test/InjectorSpec.js | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/InjectorSpec.js b/test/InjectorSpec.js
index 6e9a98f2..dea76a6b 100644
--- a/test/InjectorSpec.js
+++ b/test/InjectorSpec.js
@@ -606,8 +606,12 @@ describe('injector', function() {
 
 
     it('should allow constructor to return different object', function() {
-      var t = $injector.instantiate(function() { return 'ABC'; });
-      expect(t).toBe('ABC');
+      var obj = {};
+      var Class = function() {
+        return obj;
+      };
+
+      expect($injector.instantiate(Class)).toBe(obj);
     });
 
 
@@ -616,6 +620,25 @@ describe('injector', function() {
         $injector.instantiate(function() { throw 'MyError'; });
       }).toThrow('MyError');
     });
+
+
+    it('should return instance if constructor returns non-object value', function() {
+      var A = function() {
+        return 10;
+      };
+
+      var B = function() {
+        return 'some-string';
+      };
+
+      var C = function() {
+        return undefined;
+      };
+
+      expect($injector.instantiate(A) instanceof A).toBe(true);
+      expect($injector.instantiate(B) instanceof B).toBe(true);
+      expect($injector.instantiate(C) instanceof C).toBe(true);
+    });
   });
 
   describe('protection modes', function() {
-- 
cgit v1.2.3