#1015 use isNumber fuction to check for empty expected argument. This will allow 0 to be passed in.

This commit is contained in:
Kevin Logan
2016-02-17 12:03:06 -06:00
parent 4fb5aa14b8
commit e5c744f3dc
2 changed files with 102 additions and 66 deletions

View File

@@ -1,4 +1,12 @@
describe("toHaveBeenCalledTimes", function () { describe("toHaveBeenCalledTimes", function () {
it("passes when the actual 0 matches the expected 0 ", function () {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(),
calledSpy = jasmineUnderTest.createSpy('called-spy'),
result;
result = matcher.compare(calledSpy, 0);
expect(result.pass).toBeTruthy();
});
it("passes when the actual matches the expected", function () { it("passes when the actual matches the expected", function () {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), var matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(),
calledSpy = jasmineUnderTest.createSpy('called-spy'), calledSpy = jasmineUnderTest.createSpy('called-spy'),
@@ -6,10 +14,10 @@ describe("toHaveBeenCalledTimes", function() {
calledSpy(); calledSpy();
result = matcher.compare(calledSpy, 1); result = matcher.compare(calledSpy, 1);
expect(result.pass).toBe(true); expect(result.pass).toBeTruthy();
}); });
it("fails when expected numbers is not supplied", function(){ it("fails when expected number is not supplied", function () {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), var matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(),
spy = jasmineUnderTest.createSpy('spy'), spy = jasmineUnderTest.createSpy('spy'),
result; result;
@@ -17,7 +25,18 @@ describe("toHaveBeenCalledTimes", function() {
spy(); spy();
expect(function () { expect(function () {
matcher.compare(spy); matcher.compare(spy);
}).toThrowError('Expected times failed is required as an argument.'); }).toThrowError('The expected times failed is a required argument and must be a number.');
});
it("fails when expected number is a string", function () {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(),
spy = jasmineUnderTest.createSpy('spy'),
result;
spy();
expect(function () {
matcher.compare(spy, "1");
}).toThrowError('The expected times failed is a required argument and must be a number.');
}); });
it("fails when the actual was called less than the expected", function () { it("fails when the actual was called less than the expected", function () {
@@ -26,7 +45,7 @@ describe("toHaveBeenCalledTimes", function() {
result; result;
result = matcher.compare(uncalledSpy, 2); result = matcher.compare(uncalledSpy, 2);
expect(result.pass).toBe(false); expect(result.pass).toBeFalsy();
}); });
it("fails when the actual was called more than expected", function () { it("fails when the actual was called more than expected", function () {
@@ -38,7 +57,7 @@ describe("toHaveBeenCalledTimes", function() {
uncalledSpy(); uncalledSpy();
result = matcher.compare(uncalledSpy, 1); result = matcher.compare(uncalledSpy, 1);
expect(result.pass).toBe(false); expect(result.pass).toBeFalsy();
}); });
it("throws an exception when the actual is not a spy", function () { it("throws an exception when the actual is not a spy", function () {
@@ -77,5 +96,22 @@ describe("toHaveBeenCalledTimes", function() {
expect(result.message).toEqual('Expected spy sample-spy to have been called 2 times. It was called ' + 4 + ' times.'); expect(result.message).toEqual('Expected spy sample-spy to have been called 2 times. It was called ' + 4 + ' times.');
}); });
/*
it("should work when chained to expect", function(){
// test for the way we'll use it in real code
var foo = {
func: function(){}
};
spyOn(foo, 'func');
expect(foo.func).toHaveBeenCalledTimes(0);
foo.func();
expect(foo.func).toHaveBeenCalledTimes(1);
foo.func();
foo.func();
foo.func();
expect(foo.func).toHaveBeenCalledTimes(4);
foo.func.calls.reset();
expect(foo.func).toHaveBeenCalledTimes(0);
});*/
}); });

View File

@@ -10,8 +10,8 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) {
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
result = { pass: false }; result = { pass: false };
if(!expected){ if (!j$.isNumber_(expected)){
throw new Error('Expected times failed is required as an argument.'); throw new Error('The expected times failed is a required argument and must be a number.');
} }
actual = args[0]; actual = args[0];