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

Make the check for pending spec exception work for values that don't have toString

Browse Source
This commit is contained in:
Sheel Choksi
2014-01-04 23:08:21 -08:00
parent f576395620
commit b525313cdb
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,7 +366,7 @@ getJasmineRequireObj().Spec = function(j$) {
Spec.pendingSpecExceptionMessage = "=> marked Pending"; Spec.pendingSpecExceptionMessage = "=> marked Pending";
Spec.isPendingSpecException = function(e) { Spec.isPendingSpecException = function(e) {
return e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1; return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1);
}; };
return Spec; return Spec;

4
spec/core/SpecSpec.js
View File

@@ -20,6 +20,10 @@ describe("Spec", function() {
expect(j$.Spec.isPendingSpecException(e)).toBe(false); expect(j$.Spec.isPendingSpecException(e)).toBe(false);
}); });
it("#isPendingSpecException returns false for thrown values that don't have toString", function() {
expect(j$.Spec.isPendingSpecException(void 0)).toBe(false);
});
it("delegates execution to a QueueRunner", function() { it("delegates execution to a QueueRunner", function() {
var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'), var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
spec = new j$.Spec({ spec = new j$.Spec({

2
src/core/Spec.js
View File

@@ -141,7 +141,7 @@ getJasmineRequireObj().Spec = function(j$) {
Spec.pendingSpecExceptionMessage = "=> marked Pending"; Spec.pendingSpecExceptionMessage = "=> marked Pending";
Spec.isPendingSpecException = function(e) { Spec.isPendingSpecException = function(e) {
return e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1; return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1);
}; };
return Spec; return Spec;