Merge branch 'lalunamel-master'

Merges #942
Fixes #930
Fixes #912
This commit is contained in:
Gregg Van Hove
2015-10-15 09:20:43 -07:00
3 changed files with 13 additions and 2 deletions

View File

@@ -918,7 +918,7 @@ getJasmineRequireObj().Env = function(j$) {
this.xit = function() { this.xit = function() {
var spec = this.it.apply(this, arguments); var spec = this.it.apply(this, arguments);
spec.pend(); spec.pend('Temporarily disabled with xit');
return spec; return spec;
}; };

View File

@@ -45,4 +45,15 @@ describe("Env", function() {
throwOnExpectationFailure: true throwOnExpectationFailure: true
})); }));
}); });
describe('#xit', function() {
it('calls spec.pend with "Temporarily disabled with xit"', function() {
var pendSpy = jasmine.createSpy();
spyOn(env, 'it').and.returnValue({
pend: pendSpy
});
env.xit();
expect(pendSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
});
});
}); });

View File

@@ -416,7 +416,7 @@ getJasmineRequireObj().Env = function(j$) {
this.xit = function() { this.xit = function() {
var spec = this.it.apply(this, arguments); var spec = this.it.apply(this, arguments);
spec.pend(); spec.pend('Temporarily disabled with xit');
return spec; return spec;
}; };