From 4260d906dac441a54535b21ddf819f3dabbe6e20 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 17 Aug 2020 12:48:39 -0400
Subject: [PATCH] Migrate from ember-test-waiters to @ember/test-waiters.

---
 .../test-helpers/-internal/debug-info.ts      |  2 +-
 .../@ember/test-helpers/settled.ts            |  2 +-
 package.json                                  |  2 +-
 tests/unit/settled-test.js                    |  2 +-
 tests/unit/test-debug-info-test.js            |  2 +-
 yarn.lock                                     | 20 +++++++++----------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addon-test-support/@ember/test-helpers/-internal/debug-info.ts b/addon-test-support/@ember/test-helpers/-internal/debug-info.ts
index 83207884c..d3122b9cf 100644
--- a/addon-test-support/@ember/test-helpers/-internal/debug-info.ts
+++ b/addon-test-support/@ember/test-helpers/-internal/debug-info.ts
@@ -6,7 +6,7 @@ import {
 } from '@ember/runloop';
 import { DebugInfoHelper, debugInfoHelpers } from './debug-info-helpers';
 import { assign } from '@ember/polyfills';
-import { getPendingWaiterState, PendingWaiterState, TestWaiterDebugInfo } from 'ember-test-waiters';
+import { getPendingWaiterState, PendingWaiterState, TestWaiterDebugInfo } from '@ember/test-waiters';
 
 const PENDING_AJAX_REQUESTS = 'Pending AJAX requests';
 const PENDING_TEST_WAITERS = 'Pending test waiters';
diff --git a/addon-test-support/@ember/test-helpers/settled.ts b/addon-test-support/@ember/test-helpers/settled.ts
index 3c47a7eae..ae1e7e2db 100644
--- a/addon-test-support/@ember/test-helpers/settled.ts
+++ b/addon-test-support/@ember/test-helpers/settled.ts
@@ -5,7 +5,7 @@ import Ember from 'ember';
 import { nextTick } from './-utils';
 import waitUntil from './wait-until';
 import { hasPendingTransitions } from './setup-application-context';
-import { hasPendingWaiters } from 'ember-test-waiters';
+import { hasPendingWaiters } from '@ember/test-waiters';
 import DebugInfo, { TestDebugInfo } from './-internal/debug-info';
 
 // Ember internally tracks AJAX requests in the same way that we do here for
diff --git a/package.json b/package.json
index 8b4b92197..d18711610 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "broccoli-funnel": "^3.0.3",
     "ember-cli-babel": "^7.22.1",
     "ember-cli-htmlbars": "^5.2.0",
-    "ember-test-waiters": "^2.1.3"
+    "@ember/test-waiters": "^2.2.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
diff --git a/tests/unit/settled-test.js b/tests/unit/settled-test.js
index 38c802153..e7fb24359 100644
--- a/tests/unit/settled-test.js
+++ b/tests/unit/settled-test.js
@@ -5,7 +5,7 @@ import { TestDebugInfo } from '@ember/test-helpers/-internal/debug-info';
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import { _setupAJAXHooks, _teardownAJAXHooks } from '@ember/test-helpers/settled';
 import { next, later, run, schedule } from '@ember/runloop';
-import { buildWaiter, _reset as resetWaiters } from 'ember-test-waiters';
+import { buildWaiter, _reset as resetWaiters } from '@ember/test-waiters';
 import Pretender from 'pretender';
 import hasjQuery from '../helpers/has-jquery';
 import ajax from '../helpers/ajax';
diff --git a/tests/unit/test-debug-info-test.js b/tests/unit/test-debug-info-test.js
index e0b948bf7..321b9f604 100644
--- a/tests/unit/test-debug-info-test.js
+++ b/tests/unit/test-debug-info-test.js
@@ -8,7 +8,7 @@ import MockStableError, { overrideError, resetError } from './utils/mock-stable-
 import { MockConsole, getRandomBoolean, getMockDebugInfo } from './utils/test-isolation-helpers';
 import { registerDebugInfoHelper } from '@ember/test-helpers';
 import { debugInfoHelpers } from '@ember/test-helpers/-internal/debug-info-helpers';
-import { buildWaiter, _reset as resetWaiters } from 'ember-test-waiters';
+import { buildWaiter, _reset as resetWaiters } from '@ember/test-waiters';
 
 module('TestDebugInfo', function (hooks) {
   hooks.beforeEach(function () {
diff --git a/yarn.lock b/yarn.lock
index 9b59fb9f6..960205f18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1482,6 +1482,16 @@
     ember-cli-babel "^6.16.0"
     ember-compatibility-helpers "^1.1.1"
 
+"@ember/test-waiters@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-2.2.0.tgz#48539d7bae52f0f4f4ce0f438a23b50c6a84f48f"
+  integrity sha512-vMhJluP6+fV42f0HXi6RnVaS6Q1Ak0aCHvvioyburuCpYOKAiPvjDzkkiufxlzi/Oocie4azkXL8b3FHqeMe2Q==
+  dependencies:
+    ember-cli-babel "^7.21.0"
+    ember-cli-typescript "^3.1.3"
+    ember-cli-version-checker "^5.1.1"
+    semver "^7.1.3"
+
 "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
@@ -5556,16 +5566,6 @@ ember-source@~3.18.1:
     semver "^6.1.1"
     silent-error "^1.1.1"
 
-ember-test-waiters@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-2.1.3.tgz#40fe7b674d5ef1005f665e0e040753f88c5a2175"
-  integrity sha512-xDjvq8/1C3b9z3NGpez7aslbq5gsLrxsdjD3apyziHkImh/PTeXZr2bxo/YAUgOwGOtpZ1So0fIsppiSN0u1Ng==
-  dependencies:
-    ember-cli-babel "^7.21.0"
-    ember-cli-typescript "^3.1.3"
-    ember-cli-version-checker "^5.1.1"
-    semver "^7.1.3"
-
 ember-try-config@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc"