Skip to content

Commit e1568c2

Browse files
authored
Merge pull request #137 from ember-engines/ember-cli-qunit-to-ember-qunit
replace ember-cli-qunit with ember-qunit
2 parents 88f8980 + 5bcb251 commit e1568c2

File tree

4 files changed

+2893
-288
lines changed

4 files changed

+2893
-288
lines changed

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,23 @@
2727
"devDependencies": {
2828
"@babel/eslint-parser": "^7.17.0",
2929
"@babel/plugin-proposal-decorators": "^7.17.9",
30+
"@ember/test-helpers": "^2.8.0",
3031
"broccoli-asset-rev": "^3.0.0",
3132
"broccoli-test-helper": "^2.0.0",
3233
"co": "^4.6.0",
34+
"ember-auto-import": "^2.4.1",
3335
"ember-cli": "~3.12.0",
3436
"ember-cli-dependency-checker": "^3.1.0",
3537
"ember-cli-htmlbars": "^3.0.1",
3638
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
3739
"ember-cli-inject-live-reload": "^2.0.1",
38-
"ember-cli-qunit": "^4.4.0",
3940
"ember-cli-sauce": "^2.2.0",
4041
"ember-cli-shims": "^1.1.0",
4142
"ember-disable-prototype-extensions": "^1.1.0",
4243
"ember-export-application-global": "^2.0.0",
4344
"ember-load-initializers": "^2.0.0",
4445
"ember-maybe-import-regenerator": "^0.1.6",
46+
"ember-qunit": "^5.1.5",
4547
"ember-resolver": "^5.1.3",
4648
"ember-source": "~3.12.0",
4749
"ember-try": "^2.0.0",
@@ -51,7 +53,10 @@
5153
"loader.js": "^4.7.0",
5254
"mocha": "^6.0.2",
5355
"npm-run-all": "^4.1.5",
54-
"test-generator-plugin": "link:./tests/dummy/lib/test-generator-plugin"
56+
"qunit": "^2.19.1",
57+
"qunit-dom": "^2.0.0",
58+
"test-generator-plugin": "link:./tests/dummy/lib/test-generator-plugin",
59+
"webpack": "^5.72.1"
5560
},
5661
"dependencies": {
5762
"broccoli-caching-writer": "^3.0.3",

tests/index.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@
2121
{{content-for "body"}}
2222
{{content-for "test-body"}}
2323

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

2734
<!-- The following script is included just to verify it will work in Node -->

tests/test-helper.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import Application from '../app';
2-
import config from '../config/environment';
1+
import Application from 'dummy/app';
2+
import config from 'dummy/config/environment';
3+
import * as QUnit from 'qunit';
34
import { setApplication } from '@ember/test-helpers';
5+
import { setup } from 'qunit-dom';
46
import { start } from 'ember-qunit';
57

68
setApplication(Application.create(config.APP));
9+
10+
setup(QUnit.assert);
11+
712
start();

0 commit comments

Comments
 (0)