From 09254e85d000af641b93c771c3e63bceef826392 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sun, 3 Mar 2024 00:12:39 +0000 Subject: [PATCH 1/2] Remove pauseTest workaround Follows-up https://github.com/emberjs/ember-qunit/pull/497 which introduced this because QUnit 2.8 didn't support changing an existing `assert.timeout()` by calling it again in the same test (it would leave the old one unchanged, and start a second timeout). This was fixed in QUnit 2.9.3, released in Oct 2019. The ember-qunit package declares a peer dependency on `qunit@2.13.0`, which should remove the need for this workaround. Ref https://github.com/emberjs/ember-qunit/issues/496. --- addon/src/index.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addon/src/index.js b/addon/src/index.js index afe79323..73fb26f9 100644 --- a/addon/src/index.js +++ b/addon/src/index.js @@ -44,12 +44,6 @@ export function setupTest(hooks, _options) { let originalPauseTest = this.pauseTest; this.pauseTest = function QUnit_pauseTest() { assert.timeout(-1); // prevent the test from timing out - - // This is a temporary work around for - // https://github.com/emberjs/ember-qunit/issues/496 this clears the - // timeout that would fail the test when it hits the global testTimeout - // value. - clearTimeout(QUnit.config.timeout); return originalPauseTest.call(this); }; }); From b629ed436ccbc5b1d8f9bad1b07d46d3fd9316fe Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 14 Sep 2024 01:39:28 +0100 Subject: [PATCH 2/2] trigger CI