Skip to content

Commit 8949de0

Browse files
committed
replace Ember.testing with embroider/macro
1 parent 2d41789 commit 8949de0

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

app/controllers/crate/settings/new-trusted-publisher.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import Controller from '@ember/controller';
22
import { action } from '@ember/object';
33
import { service } from '@ember/service';
44
import { tracked } from '@glimmer/tracking';
5-
import Ember from 'ember';
65

6+
import { isTesting } from '@embroider/macros';
77
import { rawTimeout, restartableTask, task } from 'ember-concurrency';
88

99
export default class NewTrustedPublisherController extends Controller {
@@ -41,7 +41,7 @@ export default class NewTrustedPublisherController extends Controller {
4141
}
4242

4343
verifyWorkflowTask = restartableTask(async () => {
44-
let timeout = Ember.testing ? 0 : 500;
44+
let timeout = isTesting() ? 0 : 500;
4545
await rawTimeout(timeout);
4646

4747
let { verificationUrl } = this;

app/controllers/settings/email-notifications.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Controller from '@ember/controller';
22
import { action } from '@ember/object';
3-
import Ember from 'ember';
43

4+
import { isTesting } from '@embroider/macros';
55
import { alias } from 'macro-decorators';
66

77
import ajax from '../../utils/ajax';
@@ -15,7 +15,7 @@ export default class EmailNotificationsSettingsController extends Controller {
1515
emailNotificationsSuccess = false;
1616

1717
get hasEmailNotificationFeature() {
18-
return Ember.testing;
18+
return isTesting();
1919
}
2020

2121
setAllEmailNotifications(value) {

app/routes/application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { action } from '@ember/object';
22
import Route from '@ember/routing/route';
33
import { service } from '@ember/service';
4-
import Ember from 'ember';
54

5+
import { isTesting } from '@embroider/macros';
66
import { didCancel, dropTask, rawTimeout, task } from 'ember-concurrency';
77

88
import ajax from '../utils/ajax';
@@ -61,7 +61,7 @@ export default class ApplicationRoute extends Route {
6161

6262
checkReadOnlyStatusTask = dropTask(async () => {
6363
// delay the status check to let the more relevant data load first
64-
let timeout = Ember.testing ? 0 : 1000;
64+
let timeout = isTesting() ? 0 : 1000;
6565
await rawTimeout(timeout);
6666

6767
let { read_only, banner_message } = await ajax('/api/v1/site_metadata');

app/services/progress.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Service, { service } from '@ember/service';
22
import { htmlSafe } from '@ember/template';
33
import { tracked } from '@glimmer/tracking';
4-
import Ember from 'ember';
54

5+
import { isTesting } from '@embroider/macros';
66
import { didCancel, dropTask, rawTimeout, task } from 'ember-concurrency';
77

88
const SPEED = 200;
@@ -36,7 +36,7 @@ export default class ProgressService extends Service {
3636
});
3737

3838
updateTask = dropTask(async () => {
39-
if (Ember.testing) return;
39+
if (isTesting()) return;
4040

4141
let progress = 0;
4242
this._style = `width: 0%`;

0 commit comments

Comments
 (0)