admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allowed async functions to be passed into spy#callFake

Browse Source
This commit is contained in:
Julian Lannigan
2017-11-09 19:43:48 -05:00
parent 285f06d5c4
commit 2be5e0a962
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jasmine-core/jasmine.js
View File

@@ -5010,7 +5010,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) {
* @param {Function} fn The function to invoke with the passed parameters. * @param {Function} fn The function to invoke with the passed parameters.
*/ */
this.callFake = function(fn) { this.callFake = function(fn) {
if(!j$.isFunction_(fn)) { if(!(j$.isFunction_(fn) || j$.isAsyncFunction_(fn))) {
throw new Error('Argument passed to callFake should be a function, got ' + fn); throw new Error('Argument passed to callFake should be a function, got ' + fn);
} }
plan = fn; plan = fn;

24
spec/core/SpyStrategySpec.js
View File

@@ -92,16 +92,40 @@ describe("SpyStrategy", function() {
expect(returnValue).toEqual(67); expect(returnValue).toEqual(67);
}); });
it("allows a fake async function to be called instead", async function(done) {
try {
var originalFn = jasmine.createSpy("original"),
fakeFn = jasmine.createSpy("fake").and.callFake(async function () { return 67; }),
spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
returnValue;
spyStrategy.callFake(fakeFn);
returnValue = await spyStrategy.exec();
expect(originalFn).not.toHaveBeenCalled();
expect(returnValue).toEqual(67);
done();
} catch (err) {
done.fail(err);
}
});
it('throws an error when a non-function is passed to callFake strategy', function() { it('throws an error when a non-function is passed to callFake strategy', function() {
var originalFn = jasmine.createSpy('original'), var originalFn = jasmine.createSpy('original'),
spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}), spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
invalidFakes = [5, 'foo', {}, true, false, null, void 0, new Date(), /.*/]; invalidFakes = [5, 'foo', {}, true, false, null, void 0, new Date(), /.*/];
spyOn(jasmineUnderTest, 'isFunction_').and.returnValue(false); spyOn(jasmineUnderTest, 'isFunction_').and.returnValue(false);
spyOn(jasmineUnderTest, 'isAsyncFunction_').and.returnValue(false);
expect(function () { expect(function () {
spyStrategy.callFake(function() {}); spyStrategy.callFake(function() {});
}).toThrowError(/^Argument passed to callFake should be a function, got/); }).toThrowError(/^Argument passed to callFake should be a function, got/);
expect(function () {
spyStrategy.callFake(async function() {});
}).toThrowError(/^Argument passed to callFake should be a function, got/);
}); });
it("allows a return to plan stubbing after another strategy", function() { it("allows a return to plan stubbing after another strategy", function() {

2
src/core/SpyStrategy.js
View File

@@ -88,7 +88,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) {
* @param {Function} fn The function to invoke with the passed parameters. * @param {Function} fn The function to invoke with the passed parameters.
*/ */
this.callFake = function(fn) { this.callFake = function(fn) {
if(!j$.isFunction_(fn)) { if(!(j$.isFunction_(fn) || j$.isAsyncFunction_(fn))) {
throw new Error('Argument passed to callFake should be a function, got ' + fn); throw new Error('Argument passed to callFake should be a function, got ' + fn);
} }
plan = fn; plan = fn;