diff options
| author | Igor Minar | 2014-02-03 22:41:18 -0800 |
|---|---|---|
| committer | Igor Minar | 2014-02-03 22:41:18 -0800 |
| commit | 64d58a5b5292046adf8b28928950858ab3895fcc (patch) | |
| tree | 56c21b104645718c563b39816f2104b86715b553 /src/ngMock/angular-mocks.js | |
| parent | 3bf43903397c703aa2e9ba1e1a48dbc9e8286ee2 (diff) | |
| download | angular.js-64d58a5b5292046adf8b28928950858ab3895fcc.tar.bz2 | |
refactor(mocks): simplify the implementation
Diffstat (limited to 'src/ngMock/angular-mocks.js')
| -rw-r--r-- | src/ngMock/angular-mocks.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 0058a8ec..bb720c1d 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.call(currentSpec) : workFn; + return isSpecRunning() ? workFn() : workFn; ///////////////////// function workFn() { var modules = currentSpec.$modules || []; @@ -2138,9 +2138,8 @@ if(window.jasmine || window.mocha) { } for(var i = 0, ii = blockFns.length; i < ii; i++) { try { - /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */ - injector.invoke(blockFns[i] || angular.noop, this); - /* jshint +W040 */ + // jasmine sets this to be the current spec, so we are mimicing that + injector.invoke(blockFns[i] || angular.noop, currentSpec); } catch (e) { if (e.stack && errorForStack) { throw new ErrorAddingDeclarationLocationStack(e, errorForStack); |
