Skip to content
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.

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

update to ember-qunit 5 #427

Merged
merged 2 commits into from
May 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"dependencies": {
"babel-plugin-filter-imports": "^4.0.0",
"babel6-plugin-strip-class-callcheck": "^6.0.0",
"broccoli-funnel": "^3.0.3",
"broccoli-funnel": "^3.0.5",
"ember-classic-decorator": "^2.0.0",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.6",
"ember-cli-htmlbars": "^5.7.1",
"ember-cli-sass": "^10.0.1",
"ember-decorators": "^6.1.1",
Expand All @@ -42,34 +42,36 @@
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "~2.2.5",
"@html-next/flexi-default-styles": "^2.2.0",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.26.1",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
"ember-cli": "~3.26.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-power-select": "^4.1.2",
"ember-qunit": "^4.6.0",
"ember-power-select": "^4.1.5",
"ember-qunit": "~5.1.3",
"ember-raf-test-waiter": "^0.1.0",
"ember-resolver": "^8.0.2",
"ember-source": "~3.27.1",
"ember-source-channel-url": "^3.0.0",
"ember-source": "~3.27.1",
"ember-try": "^1.4.0",
"eslint": "^7.26.0",
"eslint-plugin-ember": "^9.6.0",
"eslint-plugin-node": "^11.1.0",
"eslint": "^7.26.0",
"flexi": "^2.1.0",
"loader.js": "^4.7.0",
"qunit": "~2.15.0",
"qunit-dom": "^1.6.0",
"release-it": "^14.6.2",
"release-it-lerna-changelog": "^3.1.0"
"release-it-lerna-changelog": "^3.1.0",
"release-it": "^14.6.2"
},
"resolutions": {
"@embroider/util": "^0.40.0",
Expand Down
7 changes: 7 additions & 0 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
{{content-for "body"}}
{{content-for "test-body"}}

<div id="qunit"></div>
<div id="qunit-fixture">
<div id="ember-testing-container">
<div id="ember-testing"></div>
</div>
</div>

<script src="/testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
Expand Down
7 changes: 6 additions & 1 deletion tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ import { registerWaiter } from 'ember-raf-test-waiter';
import config from '../config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';
import * as QUnit from 'qunit';
import { setup } from 'qunit-dom';

registerWaiter();

setup(QUnit.assert);

setApplication(Application.create(config.APP));

registerWaiter();

start();
Loading