From 3bf43903397c703aa2e9ba1e1a48dbc9e8286ee2 Mon Sep 17 00:00:00 2001
From: Wes Alvaro <hello@wesalvaro.com>
Date: Mon, 3 Feb 2014 16:53:52 -0800
Subject: [PATCH] fix(mocks): always call functions injected with `inject` with
 `this` set to the current spec

Currently when a function is injected inside of a test we set the context to undefined which
is a bug.

Closes #6102
---
 src/ngMock/angular-mocks.js      |  2 +-
 test/ngMock/angular-mocksSpec.js | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 19f0ac9d7ed9..0058a8ec1dfe 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -2125,7 +2125,7 @@ if(window.jasmine || window.mocha) {
   window.inject = angular.mock.inject = function() {
     var blockFns = Array.prototype.slice.call(arguments, 0);
     var errorForStack = new Error('Declaration Location');
-    return isSpecRunning() ? workFn() : workFn;
+    return isSpecRunning() ? workFn.call(currentSpec) : workFn;
     /////////////////////
     function workFn() {
       var modules = currentSpec.$modules || [];
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index fb602adc2ace..e5f67a7ebc48 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -864,6 +864,25 @@ describe('ngMock', function() {
       });
 
 
+      describe('this', function() {
+
+        it('should set `this` to be the jasmine context', inject(function() {
+          expect(this instanceof jasmine.Spec).toBe(true);
+        }));
+
+        it('should set `this` to be the jasmine context when inlined in a test', function() {
+          var tested = false;
+
+          inject(function() {
+            expect(this instanceof jasmine.Spec).toBe(true);
+            tested = true;
+          });
+
+          expect(tested).toBe(true);
+        });
+      });
+
+
       // We don't run the following tests on IE8.
       // IE8 throws "Object does not support this property or method." error,
       // when thrown from a function defined on window (which `inject` is).