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

Merge branch 'feat/improveErrorMessages' of https://github.com/dhoko/jasmine into dhoko-feat/improveErrorMessages

Browse Source 
- Merges #1026 from @dhoko
- Fixes #1025
This commit is contained in:
slackersoft
2016-03-18 10:40:44 -07:00
parent 11cfaae42a 14067d0785
commit 954a6a0091
16 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spec/core/formatErrorMsgSpec.js Normal file
View File

@@ -0,0 +1,13 @@
describe('formatErrorMsg', function () {
it('should format an error with a domain', function() {
var formator = jasmineUnderTest.formatErrorMsg('api');
expect(formator('message')).toBe('api : message');
expect(formator('message2')).toBe('api : message2');
});
it('should format an error with a domain and usage', function() {
var formator = jasmineUnderTest.formatErrorMsg('api', 'with a param');
expect(formator('message')).toBe('api : message\nUsage: with a param');
expect(formator('message2')).toBe('api : message2\nUsage: with a param');
});
});

4
spec/core/matchers/toHaveBeenCalledSpec.js
View File

@@ -24,14 +24,14 @@ describe("toHaveBeenCalled", function() {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalled(),
fn = function() {};
expect(function() { matcher.compare(fn) }).toThrow(new Error("Expected a spy, but got Function."));
expect(function() { matcher.compare(fn) }).toThrowError(Error, /Expected a spy, but got Function./);
});
it("throws an exception when invoked with any arguments", function() {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalled(),
spy = jasmineUnderTest.createSpy('sample spy');
expect(function() { matcher.compare(spy, 'foo') }).toThrow(new Error("toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith"));
expect(function() { matcher.compare(spy, 'foo') }).toThrowError(Error, /Does not take arguments, use toHaveBeenCalledWith/);
});
it("has a custom message on failure", function() {

4
spec/core/matchers/toHaveBeenCalledTimesSpec.js
View File

@@ -24,7 +24,7 @@ describe("toHaveBeenCalledTimes", function() {
spy();
expect(function() {
matcher.compare(spy);
}).toThrowError('The expected times failed is a required argument and must be a number.');
}).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() {
@@ -54,7 +54,7 @@ describe("toHaveBeenCalledTimes", function() {
expect(function() {
matcher.compare(fn);
}).toThrowError("Expected a spy, but got Function.");
}).toThrowError(/Expected a spy, but got Function./);
});
it("has a custom message on failure that tells it was called only once", function() {

3
spec/core/matchers/toHaveBeenCalledWithSpec.js
View File

@@ -1,4 +1,5 @@
describe("toHaveBeenCalledWith", function() {
it("passes when the actual was called with matching parameters", function() {
var util = {
contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
@@ -61,6 +62,6 @@ describe("toHaveBeenCalledWith", function() {
var matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(),
fn = function() {};
expect(function() { matcher.compare(fn) }).toThrow(new Error("Expected a spy, but got Function."));
expect(function() { matcher.compare(fn) }).toThrowError(/Expected a spy, but got Function./);
});
});

3
spec/core/matchers/toMatchSpec.js
View File

@@ -1,4 +1,5 @@
describe("toMatch", function() {
it("passes when RegExps are equivalent", function() {
var matcher = jasmineUnderTest.matchers.toMatch(),
result;
@@ -36,7 +37,7 @@ describe("toMatch", function() {
expect(function() {
matcher.compare('foo', { bar: 'baz' });
}).toThrowError('Expected is not a String or a RegExp');
}).toThrowError(/Expected is not a String or a RegExp/);
});
});

8
spec/core/matchers/toThrowErrorSpec.js
View File

@@ -4,7 +4,7 @@ describe("toThrowError", function() {
expect(function() {
matcher.compare({});
}).toThrowError("Actual is not a Function");
}).toThrowError(/Actual is not a Function/);
});
it("throws an error when the expected is not an Error, string, or RegExp", function() {
@@ -15,7 +15,7 @@ describe("toThrowError", function() {
expect(function() {
matcher.compare(fn, 1);
}).toThrowError("Expected is not an Error, string, or RegExp.");
}).toThrowError(/Expected is not an Error, string, or RegExp./);
});
it("throws an error when the expected error type is not an Error", function() {
@@ -26,7 +26,7 @@ describe("toThrowError", function() {
expect(function() {
matcher.compare(fn, void 0, "foo");
}).toThrowError("Expected error type is not an Error.");
}).toThrowError(/Expected error type is not an Error./);
});
it("throws an error when the expected error message is not a string or RegExp", function() {
@@ -37,7 +37,7 @@ describe("toThrowError", function() {
expect(function() {
matcher.compare(fn, Error, 1);
}).toThrowError("Expected error message is not a string or RegExp.");
}).toThrowError(/Expected error message is not a string or RegExp./);
});
it("fails if actual does not throw at all", function() {

3
spec/core/matchers/toThrowSpec.js
View File

@@ -1,11 +1,12 @@
describe("toThrow", function() {
it("throws an error when the actual is not a function", function() {
var matcher = jasmineUnderTest.matchers.toThrow();
expect(function() {
matcher.compare({});
matcherComparator({});
}).toThrowError("Actual is not a Function");
}).toThrowError(/Actual is not a Function/);
});
it("fails if actual does not throw", function() {