Skip to content

Commit

Permalink
Migrate from ember-test-waiters to @ember/test-waiters.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed Aug 17, 2020
1 parent ab5d959 commit 4260d90
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion addon-test-support/@ember/test-helpers/settled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/settled-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test-debug-info-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 4260d90

Please sign in to comment.