Skip to content

Commit 489cd49

Browse files
Get rid of custom resolver form an older era of the blueprint (#1442)
* Get rid of custom resolver stuff * Upgrade ember-qunit * We need loadTests() from ember-qunit in AMD environments * hm
1 parent 5c9c39e commit 489cd49

11 files changed

Lines changed: 30 additions & 87 deletions

File tree

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
import { setResolver } from '@ember/test-helpers';
2-
import resolver from './helpers/resolver';
1+
import Application from 'dummy/app';
2+
import config from 'dummy/config/environment';
3+
import { setApplication } from '@ember/test-helpers';
34
import loadEmberExam from 'ember-exam/test-support/load';
4-
import { start } from 'ember-qunit';
5+
import { start, setupEmberOnerrorValidation } from 'ember-qunit';
6+
import { loadTests } from 'ember-qunit/test-loader';
57

6-
setResolver(resolver);
8+
setApplication(Application.create(config.APP));
9+
setupEmberOnerrorValidation();
710

811
loadEmberExam();
912

13+
loadTests();
1014
start();

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"ember-concurrency": "4.0.4",
7070
"ember-eslint": "0.5.0",
7171
"ember-load-initializers": "2.1.2",
72-
"ember-qunit": "8.1.1",
72+
"ember-qunit": "9.0.3",
7373
"ember-resolver": "11.0.1",
7474
"ember-source": "5.12.0",
7575
"ember-source-channel-url": "3.0.0",

pnpm-lock.yaml

Lines changed: 5 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/dummy/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

tests/dummy/app/resolver.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/helpers/destroy-app.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/helpers/module-for-acceptance.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

tests/helpers/resolver.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/helpers/start-app.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/index.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
{{content-for "body"}}
2121
{{content-for "test-body"}}
2222

23+
<div id="qunit"></div>
24+
<div id="qunit-fixture">
25+
<div id="ember-testing-container">
26+
<div id="ember-testing"></div>
27+
</div>
28+
</div>
29+
2330
<script src="/testem.js" integrity="" data-embroider-ignore></script>
2431
<script src="{{rootURL}}assets/vendor.js"></script>
2532
<script src="{{rootURL}}assets/test-support.js"></script>

0 commit comments

Comments
 (0)