diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 26c9f6ae46c..a76b364b554 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1,4 +1,9 @@
-import { ApplicationTestCase, moduleFor, strip } from 'internal-test-helpers';
+import {
+ ApplicationTestCase,
+ ModuleBasedTestResolver,
+ moduleFor,
+ strip,
+} from 'internal-test-helpers';
import { ENV } from '@ember/-internals/environment';
import {
@@ -292,6 +297,7 @@ if (ENV._DEBUG_RENDER_TREE) {
'engine:foo',
class extends Engine {
isFooEngine = true;
+ Resolver = ModuleBasedTestResolver;
init() {
super.init(...arguments);
@@ -327,6 +333,8 @@ if (ENV._DEBUG_RENDER_TREE) {
this.add(
'engine:bar',
class extends Engine {
+ Resolver = ModuleBasedTestResolver;
+
init() {
super.init(...arguments);
this.register(
@@ -670,6 +678,7 @@ if (ENV._DEBUG_RENDER_TREE) {
'engine:foo',
class extends Engine {
isFooEngine = true;
+ Resolver = ModuleBasedTestResolver;
init() {
super.init(...arguments);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index b9e95a4c745..9185b32f3d1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -1,4 +1,10 @@
-import { moduleFor, ApplicationTestCase, strip, runTaskNext } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ApplicationTestCase,
+ ModuleBasedTestResolver,
+ strip,
+ runTaskNext,
+} from 'internal-test-helpers';
import { Component } from '@ember/-internals/glimmer';
import { Route } from '@ember/-internals/routing';
@@ -80,6 +86,8 @@ moduleFor(
this.add(
'engine:blog',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -131,6 +139,8 @@ moduleFor(
this.add(
'engine:chat-engine',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register('template:application', compile('Engine'));
@@ -167,6 +177,8 @@ moduleFor(
this.add(
'engine:blog',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register('template:foo', compile('foo partial'));
@@ -202,6 +214,8 @@ moduleFor(
this.add(
'engine:chat-engine',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register('template:foo', compile('foo partial'));
@@ -230,6 +244,8 @@ moduleFor(
this.add(
'engine:chat-engine',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register('template:components/foo-bar', compile(`{{partial "troll"}}`));
@@ -289,6 +305,8 @@ moduleFor(
this.add(
'engine:blog',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
@@ -344,6 +362,8 @@ moduleFor(
this.add(
'engine:blog',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -486,6 +506,8 @@ moduleFor(
this.add(
'engine:blog',
Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register('template:application', compile('Engine{{outlet}}'));
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index f76fe425763..0cbbfffea96 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -1,4 +1,10 @@
-import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ApplicationTestCase,
+ ModuleBasedTestResolver,
+ RenderingTestCase,
+ runTask,
+} from 'internal-test-helpers';
import { set } from '@ember/-internals/metal';
import { getOwner } from '@ember/-internals/owner';
@@ -48,6 +54,7 @@ moduleFor(
'engine:chat',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
init() {
this._super(...arguments);
@@ -165,6 +172,8 @@ moduleFor(
'engine:foo',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -180,6 +189,8 @@ moduleFor(
'engine:bar',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -244,6 +255,8 @@ moduleFor(
'engine:foo',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -299,6 +312,8 @@ moduleFor(
'engine:paramEngine',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -393,6 +408,8 @@ moduleFor(
'engine:componentParamEngine',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
@@ -429,6 +446,8 @@ if (!EMBER_ROUTING_MODEL_ARG) {
'engine:paramEngine',
Engine.extend({
router: null,
+ Resolver: ModuleBasedTestResolver,
+
init() {
this._super(...arguments);
this.register(
diff --git a/packages/@ember/application/tests/application_instance_test.js b/packages/@ember/application/tests/application_instance_test.js
index 8000d48b668..128b13217e4 100644
--- a/packages/@ember/application/tests/application_instance_test.js
+++ b/packages/@ember/application/tests/application_instance_test.js
@@ -5,7 +5,11 @@ import { run } from '@ember/runloop';
import { privatize as P } from '@ember/-internals/container';
import { factory } from 'internal-test-helpers';
import { Object as EmberObject } from '@ember/-internals/runtime';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ModuleBasedTestResolver,
+ AbstractTestCase as TestCase,
+} from 'internal-test-helpers';
import { getDebugFunction, setDebugFunction } from '@ember/debug';
const originalDebug = getDebugFunction('debug');
@@ -23,7 +27,13 @@ moduleFor(
document.getElementById('qunit-fixture').innerHTML = `
HI
`;
- application = run(() => Application.create({ rootElement: '#one', router: null }));
+ application = run(() =>
+ Application.create({
+ rootElement: '#one',
+ router: null,
+ Resolver: ModuleBasedTestResolver,
+ })
+ );
}
teardown() {
@@ -167,7 +177,9 @@ moduleFor(
['@test can build and boot a registered engine'](assert) {
assert.expect(11);
- let ChatEngine = Engine.extend();
+ let ChatEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
let chatEngineInstance;
application.register('engine:chat', ChatEngine);
diff --git a/packages/@ember/application/tests/dependency_injection/default_resolver_test.js b/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
index 9a93484658c..79d6f8a55cb 100644
--- a/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
+++ b/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
@@ -198,6 +198,7 @@ moduleFor(
}
[`@test no assertion for routes that extend from Route`](assert) {
+ assert.test.assertions = []; // clear assertions that occurred in beforeEach
assert.expect(0);
this.application.FooRoute = Route.extend();
this.privateRegistry.resolve(`route:foo`);
@@ -211,6 +212,7 @@ moduleFor(
}
[`@test no assertion for service factories that extend from Service`](assert) {
+ assert.test.assertions = []; // clear assertions that occurred in beforeEach
assert.expect(0);
this.application.FooService = Service.extend();
this.privateRegistry.resolve('service:foo');
@@ -309,6 +311,7 @@ moduleFor(
return;
}
+ assert.test.assertions = []; // clear assertions that occurred in beforeEach
assert.expect(3);
this.application.LOG_RESOLVER = true;
@@ -330,6 +333,7 @@ moduleFor(
return;
}
+ assert.test.assertions = []; // clear assertions that occurred in beforeEach
assert.expect(3);
this.application.LOG_RESOLVER = true;
diff --git a/packages/@ember/application/tests/dependency_injection/normalization_test.js b/packages/@ember/application/tests/dependency_injection/normalization_test.js
index 5cb30c63719..fd5a72b394e 100644
--- a/packages/@ember/application/tests/dependency_injection/normalization_test.js
+++ b/packages/@ember/application/tests/dependency_injection/normalization_test.js
@@ -10,7 +10,12 @@ moduleFor(
constructor() {
super();
- application = run(Application, 'create');
+ // Must use default resolver because test resolver does not normalize
+ run(() => {
+ expectDeprecation(() => {
+ application = Application.create();
+ });
+ });
registry = application.__registry__;
}
diff --git a/packages/@ember/application/tests/dependency_injection_test.js b/packages/@ember/application/tests/dependency_injection_test.js
index 1aac565f728..779015f83ca 100644
--- a/packages/@ember/application/tests/dependency_injection_test.js
+++ b/packages/@ember/application/tests/dependency_injection_test.js
@@ -13,7 +13,12 @@ moduleFor(
constructor() {
super();
- application = run(EmberApplication, 'create');
+ // Must use default resolver because test resolver does not normalize
+ run(() => {
+ expectDeprecation(() => {
+ application = EmberApplication.create();
+ });
+ });
application.Person = EmberObject.extend({});
application.Orange = EmberObject.extend({});
diff --git a/packages/@ember/application/tests/readiness_test.js b/packages/@ember/application/tests/readiness_test.js
index 3173b889ff3..ebe9e6cf0d3 100644
--- a/packages/@ember/application/tests/readiness_test.js
+++ b/packages/@ember/application/tests/readiness_test.js
@@ -1,4 +1,4 @@
-import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
+import { moduleFor, ModuleBasedTestResolver, ApplicationTestCase } from 'internal-test-helpers';
import { run } from '@ember/runloop';
import EmberApplication from '..';
@@ -45,6 +45,7 @@ moduleFor(
Application = EmberApplication.extend({
$: jQuery,
+ Resolver: ModuleBasedTestResolver,
ready() {
readyWasCalled++;
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index 785de3119f3..c5e9ff314e3 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -1,4 +1,9 @@
-import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ModuleBasedTestResolver,
+ ApplicationTestCase,
+ runTask,
+} from 'internal-test-helpers';
import { inject as injectService } from '@ember/service';
import { Object as EmberObject, RSVP, onerrorDefault } from '@ember/-internals/runtime';
import { later } from '@ember/runloop';
@@ -465,7 +470,9 @@ moduleFor(
this.addTemplate('application', 'Hello world
');
// Register engine
- let BlogEngine = Engine.extend();
+ let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
this.add('engine:blog', BlogEngine);
// Register engine route map
@@ -502,6 +509,8 @@ moduleFor(
// Register engine
let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init(...args) {
this._super.apply(this, args);
this.register('template:application', compile('{{cache-money}}'));
@@ -544,6 +553,8 @@ moduleFor(
// Register engine
let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init(...args) {
this._super.apply(this, args);
this.register('template:application', compile('{{cache-money}}'));
@@ -582,6 +593,8 @@ moduleFor(
// Register engine
let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+
init(...args) {
this._super.apply(this, args);
this.register('template:application', compile('{{swag}}'));
diff --git a/packages/@ember/engine/tests/engine_initializers_test.js b/packages/@ember/engine/tests/engine_initializers_test.js
index 5e76b5b5696..2e253202caa 100644
--- a/packages/@ember/engine/tests/engine_initializers_test.js
+++ b/packages/@ember/engine/tests/engine_initializers_test.js
@@ -1,6 +1,10 @@
import { run } from '@ember/runloop';
import Engine from '@ember/engine';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ModuleBasedTestResolver,
+ AbstractTestCase as TestCase,
+} from 'internal-test-helpers';
let MyEngine, myEngine, myEngineInstance;
@@ -22,7 +26,9 @@ moduleFor(
}
["@test initializers require proper 'name' and 'initialize' properties"]() {
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
expectAssertion(() => {
run(() => {
@@ -38,7 +44,9 @@ moduleFor(
}
['@test initializers are passed an Engine'](assert) {
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.initializer({
name: 'initializer',
@@ -54,7 +62,9 @@ moduleFor(
['@test initializers can be registered in a specified order'](assert) {
let order = [];
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.initializer({
name: 'fourth',
after: 'third',
@@ -112,7 +122,9 @@ moduleFor(
['@test initializers can be registered in a specified order as an array'](assert) {
let order = [];
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.initializer({
name: 'third',
@@ -171,7 +183,9 @@ moduleFor(
['@test initializers can have multiple dependencies'](assert) {
let order = [];
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
let a = {
name: 'a',
@@ -226,7 +240,9 @@ moduleFor(
['@test initializers set on Engine subclasses are not shared between engines'](assert) {
let firstInitializerRunCount = 0;
let secondInitializerRunCount = 0;
- let FirstEngine = Engine.extend();
+ let FirstEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
FirstEngine.initializer({
name: 'first',
@@ -235,7 +251,9 @@ moduleFor(
},
});
- let SecondEngine = Engine.extend();
+ let SecondEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
SecondEngine.initializer({
name: 'second',
@@ -268,7 +286,9 @@ moduleFor(
['@test initializers are concatenated'](assert) {
let firstInitializerRunCount = 0;
let secondInitializerRunCount = 0;
- let FirstEngine = Engine.extend();
+ let FirstEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
FirstEngine.initializer({
name: 'first',
@@ -277,7 +297,9 @@ moduleFor(
},
});
- let SecondEngine = FirstEngine.extend();
+ let SecondEngine = FirstEngine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
SecondEngine.initializer({
name: 'second',
@@ -323,7 +345,9 @@ moduleFor(
['@test initializers are per-engine'](assert) {
assert.expect(2);
- let FirstEngine = Engine.extend();
+ let FirstEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
FirstEngine.initializer({
name: 'abc',
@@ -337,7 +361,9 @@ moduleFor(
});
});
- let SecondEngine = Engine.extend();
+ let SecondEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
SecondEngine.instanceInitializer({
name: 'abc',
initialize() {},
@@ -349,7 +375,9 @@ moduleFor(
['@test initializers are executed in their own context'](assert) {
assert.expect(1);
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.initializer({
name: 'coolInitializer',
diff --git a/packages/@ember/engine/tests/engine_instance_initializers_test.js b/packages/@ember/engine/tests/engine_instance_initializers_test.js
index 9088aa097ac..0decb91e44a 100644
--- a/packages/@ember/engine/tests/engine_instance_initializers_test.js
+++ b/packages/@ember/engine/tests/engine_instance_initializers_test.js
@@ -1,7 +1,11 @@
import { run } from '@ember/runloop';
import Engine, { setEngineParent } from '@ember/engine';
import EngineInstance from '@ember/engine/instance';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ModuleBasedTestResolver,
+ AbstractTestCase as TestCase,
+} from 'internal-test-helpers';
let MyEngine, myEngine, myEngineInstance;
@@ -36,7 +40,9 @@ moduleFor(
}
["@test initializers require proper 'name' and 'initialize' properties"]() {
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
expectAssertion(() => {
run(() => {
@@ -52,7 +58,9 @@ moduleFor(
}
['@test initializers are passed an engine instance'](assert) {
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.instanceInitializer({
name: 'initializer',
@@ -69,7 +77,9 @@ moduleFor(
['@test initializers can be registered in a specified order'](assert) {
let order = [];
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.instanceInitializer({
name: 'fourth',
@@ -129,7 +139,9 @@ moduleFor(
['@test initializers can be registered in a specified order as an array'](assert) {
let order = [];
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.instanceInitializer({
name: 'third',
@@ -190,7 +202,9 @@ moduleFor(
['@test initializers can have multiple dependencies'](assert) {
let order = [];
- MyEngine = Engine.extend();
+ MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
let a = {
name: 'a',
@@ -247,7 +261,9 @@ moduleFor(
['@test initializers set on Engine subclasses should not be shared between engines'](assert) {
let firstInitializerRunCount = 0;
let secondInitializerRunCount = 0;
- let FirstEngine = Engine.extend();
+ let FirstEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
let firstEngine, firstEngineInstance;
FirstEngine.instanceInitializer({
@@ -257,7 +273,9 @@ moduleFor(
},
});
- let SecondEngine = Engine.extend();
+ let SecondEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
let secondEngine, secondEngineInstance;
SecondEngine.instanceInitializer({
@@ -297,7 +315,9 @@ moduleFor(
['@test initializers are concatenated'](assert) {
let firstInitializerRunCount = 0;
let secondInitializerRunCount = 0;
- let FirstEngine = Engine.extend();
+ let FirstEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
FirstEngine.instanceInitializer({
name: 'first',
@@ -364,7 +384,9 @@ moduleFor(
['@test initializers are per-engine'](assert) {
assert.expect(2);
- let FirstEngine = Engine.extend();
+ let FirstEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
FirstEngine.instanceInitializer({
name: 'abc',
@@ -378,7 +400,9 @@ moduleFor(
});
});
- let SecondEngine = Engine.extend();
+ let SecondEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
SecondEngine.instanceInitializer({
name: 'abc',
initialize() {},
@@ -390,7 +414,9 @@ moduleFor(
['@test initializers are executed in their own context'](assert) {
assert.expect(1);
- let MyEngine = Engine.extend();
+ let MyEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
MyEngine.instanceInitializer({
name: 'coolInitializer',
diff --git a/packages/@ember/engine/tests/engine_instance_test.js b/packages/@ember/engine/tests/engine_instance_test.js
index 221fb83b1a9..c47348a1ba6 100644
--- a/packages/@ember/engine/tests/engine_instance_test.js
+++ b/packages/@ember/engine/tests/engine_instance_test.js
@@ -2,7 +2,11 @@ import Engine, { getEngineParent, setEngineParent } from '@ember/engine';
import EngineInstance from '@ember/engine/instance';
import { run } from '@ember/runloop';
import { factory } from 'internal-test-helpers';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ModuleBasedTestResolver,
+ AbstractTestCase as TestCase,
+} from 'internal-test-helpers';
let engine, engineInstance;
@@ -13,7 +17,10 @@ moduleFor(
super();
run(() => {
- engine = Engine.create({ router: null });
+ engine = Engine.create({
+ router: null,
+ Resolver: ModuleBasedTestResolver,
+ });
});
}
@@ -86,7 +93,9 @@ moduleFor(
}
['@test can build a child instance of a registered engine'](assert) {
- let ChatEngine = Engine.extend();
+ let ChatEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
let chatEngineInstance;
engine.register('engine:chat', ChatEngine);
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index b87e24ffd66..3ee5a4f2466 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -6,6 +6,7 @@ import { privatize as P } from '@ember/-internals/container';
import {
moduleFor,
AbstractTestCase as TestCase,
+ ModuleBasedTestResolver,
verifyInjection,
verifyRegistration,
} from 'internal-test-helpers';
@@ -20,7 +21,9 @@ moduleFor(
super();
run(() => {
- engine = Engine.create();
+ engine = Engine.create({
+ Resolver: ModuleBasedTestResolver,
+ });
context.lookup = { TestEngine: engine };
});
}
diff --git a/packages/ember-testing/tests/adapters_test.js b/packages/ember-testing/tests/adapters_test.js
index 2dcab571bd8..55cf16eb5fe 100644
--- a/packages/ember-testing/tests/adapters_test.js
+++ b/packages/ember-testing/tests/adapters_test.js
@@ -4,7 +4,7 @@ import Test from '../lib/test';
import Adapter from '../lib/adapters/adapter';
import QUnitAdapter from '../lib/adapters/qunit';
import EmberApplication from '@ember/application';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { moduleFor, ModuleBasedTestResolver, AbstractTestCase } from 'internal-test-helpers';
import { RSVP } from '@ember/-internals/runtime';
import { getDebugFunction, setDebugFunction } from '@ember/debug';
@@ -72,7 +72,9 @@ moduleFor(
});
run(function() {
- App = EmberApplication.create();
+ App = EmberApplication.create({
+ Resolver: ModuleBasedTestResolver,
+ });
Test.adapter = CustomAdapter.create();
App.setupForTesting();
});
@@ -86,7 +88,9 @@ moduleFor(
Test.adapter = null;
run(function() {
- App = EmberApplication.create();
+ App = EmberApplication.create({
+ Resolver: ModuleBasedTestResolver,
+ });
App.setupForTesting();
});
@@ -101,7 +105,9 @@ moduleFor(
Test.adapter = null;
run(function() {
- App = EmberApplication.create();
+ App = EmberApplication.create({
+ Resolver: ModuleBasedTestResolver,
+ });
App.setupForTesting();
});
diff --git a/packages/ember-testing/tests/helper_registration_test.js b/packages/ember-testing/tests/helper_registration_test.js
index 1bb74634af5..e557678266d 100644
--- a/packages/ember-testing/tests/helper_registration_test.js
+++ b/packages/ember-testing/tests/helper_registration_test.js
@@ -1,7 +1,7 @@
import { run } from '@ember/runloop';
import Test from '../lib/test';
import EmberApplication from '@ember/application';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { moduleFor, ModuleBasedTestResolver, AbstractTestCase } from 'internal-test-helpers';
let App, appBooted, helperContainer;
@@ -24,7 +24,9 @@ function setupApp() {
helperContainer = {};
run(function() {
- App = EmberApplication.create();
+ App = EmberApplication.create({
+ Resolver: ModuleBasedTestResolver,
+ });
App.setupForTesting();
App.injectTestHelpers(helperContainer);
});
diff --git a/packages/ember/tests/ember-test-helpers-test.js b/packages/ember/tests/ember-test-helpers-test.js
index a3b35c1f29a..300de65bbcc 100644
--- a/packages/ember/tests/ember-test-helpers-test.js
+++ b/packages/ember/tests/ember-test-helpers-test.js
@@ -2,6 +2,7 @@ import { Promise } from 'rsvp';
import Application from '@ember/application';
import { run, hasScheduledTimers, getCurrentRunLoop } from '@ember/runloop';
import { compile } from 'ember-template-compiler';
+import { ModuleBasedTestResolver } from 'internal-test-helpers';
const { module, test } = QUnit;
@@ -110,6 +111,7 @@ module('@ember/test-helpers emulation test', function() {
this.application = Application.create({
rootElement: '#qunit-fixture',
autoboot: false,
+ Resolver: ModuleBasedTestResolver,
});
await setupContext(this);
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index aa7f0a7aa69..1b036834e41 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -7,6 +7,7 @@ import {
import { confirmExport } from 'internal-test-helpers';
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
import { jQueryDisabled, jQuery } from '@ember/-internals/views';
+import Resolver from '@ember/application/globals-resolver';
moduleFor(
'ember reexports',
@@ -53,6 +54,18 @@ moduleFor(
Ember._setComputedDecorator;
}, 'Please migrate from Ember._setComputedDecorator to Ember._setClassicDecorator');
}
+
+ ['@test Ember.Resolver is present (but deprecated)'](assert) {
+ expectDeprecation(() => {
+ assert.strictEqual(Ember.Resolver, Resolver, 'Ember.Resolver exists');
+ }, /Using the globals resolver is deprecated/);
+ }
+
+ ['@test Ember.DefaultResolver is present (but deprecated)'](assert) {
+ expectDeprecation(() => {
+ assert.strictEqual(Ember.DefaultResolver, Resolver, 'Ember.DefaultResolver exists');
+ }, /Using the globals resolver is deprecated/);
+ }
}
);
@@ -340,8 +353,6 @@ let allExports = [
['ApplicationInstance', '@ember/application/instance', 'default'],
['Engine', '@ember/engine', 'default'],
['EngineInstance', '@ember/engine/instance', 'default'],
- ['Resolver', '@ember/application/globals-resolver', 'default'],
- ['DefaultResolver', '@ember/application/globals-resolver', 'default'],
// @ember/-internals/extension-support
['DataAdapter', '@ember/-internals/extension-support'],
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 5b7be85a6a8..996f714eb7e 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -5,10 +5,16 @@ import { compile } from 'ember-template-compiler';
import { Route, NoneLocation, HistoryLocation } from '@ember/-internals/routing';
import Controller from '@ember/controller';
import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import { moduleFor, ApplicationTestCase, runDestroy, runTask } from 'internal-test-helpers';
+import {
+ moduleFor,
+ ApplicationTestCase,
+ getTextOf,
+ ModuleBasedTestResolver,
+ runDestroy,
+ runTask,
+} from 'internal-test-helpers';
import { run } from '@ember/runloop';
import { Mixin, computed, set, addObserver } from '@ember/-internals/metal';
-import { getTextOf } from 'internal-test-helpers';
import { Component } from '@ember/-internals/glimmer';
import Engine from '@ember/engine';
import { InternalTransition as Transition } from 'router_js';
@@ -4618,7 +4624,9 @@ moduleFor(
assert.expect(2);
// Register engine
- let BlogEngine = Engine.extend();
+ let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
this.add('engine:blog', BlogEngine);
// Register engine route map
@@ -4654,7 +4662,9 @@ moduleFor(
assert.expect(1);
// Register engine
- let BlogEngine = Engine.extend();
+ let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
this.add('engine:blog', BlogEngine);
// Register engine route map
@@ -4688,7 +4698,9 @@ moduleFor(
let engineInstance;
// Register engine
- let BlogEngine = Engine.extend();
+ let BlogEngine = Engine.extend({
+ Resolver: ModuleBasedTestResolver,
+ });
this.add('engine:blog', BlogEngine);
let EngineIndexRoute = Route.extend({
init() {
diff --git a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
index 64cb6b9a853..e67cc76d7c5 100644
--- a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
@@ -9,7 +9,18 @@ import { runTask } from '../run';
export default class DefaultResolverApplicationTestCase extends AbstractApplicationTestCase {
createApplication() {
- let application = (this.application = Application.create(this.applicationOptions));
+ let application;
+ expectDeprecation(() => {
+ application = this.application = Application.create(this.applicationOptions);
+ }, /Using the globals resolver is deprecated/);
+
+ // If the test expects a certain number of assertions, increment that number
+ let { assert } = QUnit.config.current;
+ if (typeof assert.test.expected === 'number') {
+ assert.test.expected += 1;
+ QUnit.config.current.expected += 1;
+ }
+
application.Router = Router.extend(this.routerOptions);
return application;
}