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

Fix fail specs for all browsers #734

Browse Source
This commit is contained in:
Gregg Van Hove
2015-01-12 13:37:10 -08:00
parent 3a93f845d6
commit c1479acd17
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/core/integration/EnvSpec.js
View File

@@ -143,8 +143,7 @@ describe("Env integration", function() {
it('explicitly fails a spec', function(done) { it('explicitly fails a spec', function(done) {
var env = new j$.Env(), var env = new j$.Env(),
specDone = jasmine.createSpy('specDone'), specDone = jasmine.createSpy('specDone');
errorObj = new Error('error message');
env.addReporter({ env.addReporter({
specDone: specDone, specDone: specDone,
@@ -167,7 +166,16 @@ describe("Env integration", function() {
message: 'Failed: error message', message: 'Failed: error message',
stack: { stack: {
asymmetricMatch: function(other) { asymmetricMatch: function(other) {
var firstLine = other.split('\n')[1]; if (!other) {
// IE doesn't give us a stacktrace so just ignore it.
return true;
}
var split = other.split('\n'),
firstLine = split[0];
if (firstLine.indexOf('error message') >= 0) {
// Chrome inserts the message and a newline before the first stacktrace line.
firstLine = split[1];
}
return firstLine.indexOf('EnvSpec') >= 0; return firstLine.indexOf('EnvSpec') >= 0;
} }
} }
@@ -187,7 +195,7 @@ describe("Env integration", function() {
}); });
env.it('has a message and stack trace from an Error', function() { env.it('has a message and stack trace from an Error', function() {
env.fail(errorObj); env.fail(new Error('error message'));
}); });
}); });