Skip to content

chore: Remove Ember.testing deprecation #898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xn wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −6
Open

chore: Remove Ember.testing deprecation #898

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions addon/services/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from 'ember';
import { isTesting } from '@ember/debug';
import { run } from '@ember/runloop';
import Service from '@ember/service';
import { classify, dasherize } from '@ember/string';
Expand Down Expand Up @@ -74,9 +74,7 @@ import { tracked, TrackedObject } from 'tracked-built-ins';
* @extends Ember.Service
*/
export default class MediaService extends Service.extend(Evented) {
// Ember only sets Ember.testing when tests are starting
// eslint-disable-next-line ember/no-ember-testing-in-module-scope
_mocked = Ember.testing;
_mocked = isTesting();
_mockedBreakpoint = 'desktop';

/**
Expand Down Expand Up @@ -107,7 +105,7 @@ export default class MediaService extends Service.extend(Evented) {
if (this._matches.length) {
return this._matches;
}
return Ember.testing && this._mocked ? [this._mockedBreakpoint] : [];
return isTesting() && this._mocked ? [this._mockedBreakpoint] : [];
}
set matches(value) {
this._matches = value;
Expand Down Expand Up @@ -212,7 +210,7 @@ export default class MediaService extends Service.extend(Evented) {
*/
match(name, query) {
// see https://github.com/ember-cli/eslint-plugin-ember/pull/272
if ((Ember.testing && this._mocked) || !this.enabled) {
if ((isTesting() && this._mocked) || !this.enabled) {
return;
}

Expand Down
Loading