mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-10 07:44:43 +00:00
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
This commit is contained in:
parent
e7ac7aa43b
commit
3bf4390339
2 changed files with 20 additions and 1 deletions
2
src/ngMock/angular-mocks.js
vendored
2
src/ngMock/angular-mocks.js
vendored
|
|
@ -2125,7 +2125,7 @@ if(window.jasmine || window.mocha) {
|
||||||
window.inject = angular.mock.inject = function() {
|
window.inject = angular.mock.inject = function() {
|
||||||
var blockFns = Array.prototype.slice.call(arguments, 0);
|
var blockFns = Array.prototype.slice.call(arguments, 0);
|
||||||
var errorForStack = new Error('Declaration Location');
|
var errorForStack = new Error('Declaration Location');
|
||||||
return isSpecRunning() ? workFn() : workFn;
|
return isSpecRunning() ? workFn.call(currentSpec) : workFn;
|
||||||
/////////////////////
|
/////////////////////
|
||||||
function workFn() {
|
function workFn() {
|
||||||
var modules = currentSpec.$modules || [];
|
var modules = currentSpec.$modules || [];
|
||||||
|
|
|
||||||
19
test/ngMock/angular-mocksSpec.js
vendored
19
test/ngMock/angular-mocksSpec.js
vendored
|
|
@ -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.
|
// We don't run the following tests on IE8.
|
||||||
// IE8 throws "Object does not support this property or method." error,
|
// IE8 throws "Object does not support this property or method." error,
|
||||||
// when thrown from a function defined on window (which `inject` is).
|
// when thrown from a function defined on window (which `inject` is).
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue