diff --git a/src/core/JsApiReporter.js b/src/core/JsApiReporter.js index 11f2ba85..7b260f1a 100644 --- a/src/core/JsApiReporter.js +++ b/src/core/JsApiReporter.js @@ -1,9 +1,6 @@ -getJasmineRequireObj().JsApiReporter = function() { +getJasmineRequireObj().JsApiReporter = function(j$) { - var noopTimer = { - start: function(){}, - elapsed: function(){ return 0; } - }; + var noopTimer = j$.noopTimer; /** * @name jsApiReporter diff --git a/src/core/Timer.js b/src/core/Timer.js index f8270f41..f613dd1a 100644 --- a/src/core/Timer.js +++ b/src/core/Timer.js @@ -20,3 +20,10 @@ getJasmineRequireObj().Timer = function() { return Timer; }; + +getJasmineRequireObj().noopTimer = function() { + return { + start: function() {}, + elapsed: function() { return 0; } + }; +}; \ No newline at end of file diff --git a/src/core/requireCore.js b/src/core/requireCore.js index 8ff7448b..622bc8c0 100644 --- a/src/core/requireCore.js +++ b/src/core/requireCore.js @@ -41,7 +41,8 @@ var getJasmineRequireObj = (function (jasmineGlobal) { j$.Expector = jRequire.Expector(j$); j$.Expectation = jRequire.Expectation(j$); j$.buildExpectationResult = jRequire.buildExpectationResult(); - j$.JsApiReporter = jRequire.JsApiReporter(); + j$.noopTimer = jRequire.noopTimer(); + j$.JsApiReporter = jRequire.JsApiReporter(j$); j$.matchersUtil = jRequire.matchersUtil(j$); j$.ObjectContaining = jRequire.ObjectContaining(j$); j$.ArrayContaining = jRequire.ArrayContaining(j$); diff --git a/src/html/HtmlReporter.js b/src/html/HtmlReporter.js index a5ad4c63..e404bed8 100644 --- a/src/html/HtmlReporter.js +++ b/src/html/HtmlReporter.js @@ -1,9 +1,6 @@ jasmineRequire.HtmlReporter = function(j$) { - var noopTimer = { - start: function() {}, - elapsed: function() { return 0; } - }; + var noopTimer = j$.noopTimer; function ResultsStateBuilder() { this.topResults = new j$.ResultsNode({}, '', null);