Skip to content

Commit c41192c

Browse files
committed
Fixed return value from mock() and stub()
git-svn-id: http://boss.bekk.no/repos/projects/jack/trunk@3995 43881228-ca37-0410-962c-81b306aa3a78
1 parent 60ae3fc commit c41192c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/jack.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@
318318
ex._argumentConstraintsMet = true;
319319
ex._matchingInvocations = [];
320320
ex._mockImplementation = null;
321-
ex.mock = function(implementation) { ex._mockImplementation = implementation };
322-
ex.stub = function() { ex._mockImplementation = emptyFunction };
321+
ex.mock = function(implementation) { ex._mockImplementation = implementation; return ex; };
322+
ex.stub = function() { ex._mockImplementation = emptyFunction; return ex; };
323323
ex.returnValue = function(v) { ex._mockImplementation = function() { return v; } }
324324
ex.atLeast = function(n) { ex._times = parseTimes(n); ex._timesModifier = 1; return ex; }
325325
ex.atMost = function(n) { ex._times = parseTimes(n); ex._timesModifier = -1; return ex; }

test/test_01_jack_api.js

+5
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,10 @@ describe('Jack API', {
302302
}
303303

304304
jack(function(){
305+
var returnValueFromJackStub =
305306
jack.expect("jQuery.ajax").stub();
306307
jQuery.ajax();
308+
value_of(returnValueFromJackStub).should_not_be_undefined();
307309
});
308310

309311
value_of(realJQueryAjaxCalled).should_be_false();
@@ -321,17 +323,20 @@ describe('Jack API', {
321323
}
322324

323325
jack(function(){
326+
var returnValueFromJackMock =
324327
jack.grab("jQuery.ajax").mock(function(){
325328
mockJQueryAjaxCalled = true;
326329
return expectedReturnValue;
327330
});
328331
actualReturnValue = jQuery.ajax();
332+
value_of(returnValueFromJackMock).should_not_be_undefined();
329333
});
330334

331335
value_of(realJQueryAjaxCalled).should_be_false();
332336
value_of(mockJQueryAjaxCalled).should_be_true();
333337
value_of(actualReturnValue).should_be(expectedReturnValue);
334338

339+
335340
window.jQuery = null;
336341
}
337342
,

0 commit comments

Comments
 (0)