diff --git a/spec/core/UtilSpec.js b/spec/core/UtilSpec.js index 1cd616a2..8c42fddb 100644 --- a/spec/core/UtilSpec.js +++ b/spec/core/UtilSpec.js @@ -96,8 +96,10 @@ describe("jasmineUnderTest.util", function() { describe("jasmineFile", function() { it("returns the file containing jasmine.util", function() { - expect(jasmineUnderTest.util.jasmineFile()).toMatch(/util.js$/); - expect(jasmine.util.jasmineFile()).toMatch(/jasmine.js$/); + // Chrome sometimes reports foo.js as foo.js/, so tolerate + // a trailing slash if present. + expect(jasmineUnderTest.util.jasmineFile()).toMatch(/util.js\/?$/); + expect(jasmine.util.jasmineFile()).toMatch(/jasmine.js\/?$/); }); }); }); diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js index fa5b3dfa..ca3a5f86 100644 --- a/spec/core/integration/EnvSpec.js +++ b/spec/core/integration/EnvSpec.js @@ -2201,13 +2201,12 @@ describe("Env integration", function() { var env = new jasmineUnderTest.Env(); var reporter = jasmine.createSpyObj('reporter', ['jasmineDone', 'suiteDone', 'specDone']); - + reporter.jasmineDone.and.callFake(function(e) { - debugger; expect(e.overallStatus).toEqual('failed'); done(); }); - + env.addReporter(reporter); env.it('passes', function() {}); global.onerror('Uncaught Error: ENOCHEESE');