Skip to content

Commit

Permalink
Update Addon to use @/ember/test-waiters
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikek2252 committed May 11, 2024
1 parent 152047c commit 7563f27
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 3 deletions.
14 changes: 14 additions & 0 deletions addon-test-support/register-waiter.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
/* eslint-disable ember/no-legacy-test-waiters */
import { registerWaiter as emberRegisterWaiter } from '@ember/test';
import scheduler from 'ember-raf-scheduler';
import { deprecate } from '@ember/debug';

export default function registerWaiter() {
deprecate(
'`registerWaiter` is not longer required. This can now be safely removed.',
false,
{
id: 'ember-raf-scheduler.legacy-register-waiter',
until: '0.5.0',
for: 'ember-raf-scheduler',
since: {
available: '0.4.1',
enabled: '0.4.1',
},
}
);
emberRegisterWaiter(function () {
return scheduler.jobs === 0;
});
Expand Down
5 changes: 5 additions & 0 deletions addon/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { DEBUG } from '@glimmer/env';
import { begin, end } from '@ember/runloop';
import { assert } from '@ember/debug';
import { buildWaiter } from '@ember/test-waiters';

const waiter = buildWaiter('ember-raf-scheduler-waiter');

export class Token {
constructor(parent) {
Expand All @@ -25,10 +28,12 @@ export class Token {
}

function job(cb, token) {
let jobToken = waiter.beginAsync();
return function execJob() {
if (token.cancelled === false) {
cb();
}
waiter.endAsync(jobToken);
};
}

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@ember/test-waiters": "^3.1.0",
"@embroider/test-setup": "^2.1.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand Down
3 changes: 0 additions & 3 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import config from 'dummy/config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';

import registerWaiter from 'ember-raf-scheduler/test-support/register-waiter';
setApplication(Application.create(config.APP));

registerWaiter();

start();
10 changes: 10 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1139,6 +1139,16 @@
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"

"@ember/test-waiters@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.1.0.tgz#61399919cbf793978da0b8bfdfdb7bca0cb80e9e"
integrity sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ==
dependencies:
calculate-cache-key-for-tree "^2.0.0"
ember-cli-babel "^7.26.6"
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"

"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.0":
version "1.13.1"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.1.tgz#aee17e5af0e0086bd36873bdb4e49ea346bab3fa"
Expand Down

0 comments on commit 7563f27

Please sign in to comment.