From 70cc221ac76d9a170191ab8a4ece7c853975ca49 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 21 Feb 2018 12:00:31 +0100 Subject: [PATCH] Extract `setupPauseTest()` function --- .../ember-mocha/setup-container-test.js | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/addon-test-support/ember-mocha/setup-container-test.js b/addon-test-support/ember-mocha/setup-container-test.js index aa79cde5..e1884619 100644 --- a/addon-test-support/ember-mocha/setup-container-test.js +++ b/addon-test-support/ember-mocha/setup-container-test.js @@ -15,6 +15,15 @@ function chainHooks(hooks, context) { return hooks.reduce((promise, fn) => promise.then(fn.bind(context)), resolve()); } +function setupPauseTest(context) { + let originalPauseTest = context.pauseTest; + context.pauseTest = function Mocha_pauseTest() { + context.timeout(0); // prevent the test from timing out + + return originalPauseTest.call(context); + }; +} + export default function setupUnitTest(options) { let originalContext; let beforeEachHooks = []; @@ -23,15 +32,9 @@ export default function setupUnitTest(options) { beforeEach(function() { originalContext = _assign({}, this); - return setupContext(this, options).then(() => { - - let originalPauseTest = this.pauseTest; - this.pauseTest = function Mocha_pauseTest() { - this.timeout(0); // prevent the test from timing out - - return originalPauseTest.call(this); - }; - }).then(() => chainHooks(beforeEachHooks, this)); + return setupContext(this, options) + .then(() => setupPauseTest(this)) + .then(() => chainHooks(beforeEachHooks, this)); }); afterEach(function() {