From ca6fa6f711dfdf7695a54d264a202744f2d7a830 Mon Sep 17 00:00:00 2001 From: slackersoft Date: Wed, 16 Oct 2013 18:39:03 -0700 Subject: [PATCH] Env no longer automatically uninstalls the clock after each spec - Behaves more like how we want plugins to behave [#58281436] --- spec/core/EnvSpec.js | 1 + src/core/Env.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index 66d9ed9b..53213d8a 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -356,6 +356,7 @@ describe("Env integration", function() { env.clock.install(); env.clock.setTimeout(delayedFunctionForMockClock, 100); env.clock.tick(100); + env.clock.uninstall(); }); env.it("test without mock clock", function() { env.clock.setTimeout(delayedFunctionForGlobalClock, 100); diff --git a/src/core/Env.js b/src/core/Env.js index 5c1fa813..4df5a0e1 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -170,7 +170,6 @@ getJasmineRequireObj().Env = function(j$) { removeAllSpies(); j$.Expectation.resetMatchers(); customEqualityTesters.length = 0; - self.clock.uninstall(); self.currentSpec = null; self.reporter.specDone(result); }