From 9928674b375b284fc54edc6688eaeb19ef53dfb8 Mon Sep 17 00:00:00 2001 From: "Davis W. Frank" Date: Sun, 14 Jun 2009 23:41:14 -0700 Subject: [PATCH] dwf: moved test of #explodes into SpecRunningTest.js - GREEN --- spec/suites/SpecRunningTest.js | 11 ++++++----- {lib => src}/jsUnitMockTimeout.js | 0 2 files changed, 6 insertions(+), 5 deletions(-) rename {lib => src}/jsUnitMockTimeout.js (100%) diff --git a/spec/suites/SpecRunningTest.js b/spec/suites/SpecRunningTest.js index f3c20982..d74f5f34 100644 --- a/spec/suites/SpecRunningTest.js +++ b/spec/suites/SpecRunningTest.js @@ -700,7 +700,7 @@ describe("jasmine spec running", function () { it('shouldn\'t execute specs in disabled suites', function() { var spy = jasmine.createSpy(); var disabledSuite = env.xdescribe('a disabled suite', function() { - it('enabled spec, but should not be run', function() { + env.it('enabled spec, but should not be run', function() { spy(); }); }); @@ -712,10 +712,10 @@ describe("jasmine spec running", function () { it('#explodes should throw an exception when it is called inside a spec', function() { var exceptionMessage = false; - var suite = env.describe('Spec', function () { - it('plodes', function() { + var anotherSuite = env.describe('Spec', function () { + env.it('plodes', function() { try { - jasmine.explodes(); + this.explodes(); } catch (e) { exceptionMessage = e; @@ -723,7 +723,8 @@ describe("jasmine spec running", function () { expect(exceptionMessage).toNotEqual(false); }); }); - suite.execute(); + + anotherSuite.execute(); expect(exceptionMessage).toEqual('explodes function should not have been called'); }); diff --git a/lib/jsUnitMockTimeout.js b/src/jsUnitMockTimeout.js similarity index 100% rename from lib/jsUnitMockTimeout.js rename to src/jsUnitMockTimeout.js