Skip to content

Commit

Permalink
Merge pull request #699 from simplabs/renovate/ember-qunit-5.x
Browse files Browse the repository at this point in the history
Update dependency ember-qunit to v5
  • Loading branch information
Turbo87 authored May 6, 2021
2 parents c446b1c + e2c4d37 commit 9510095
Show file tree
Hide file tree
Showing 4 changed files with 2,986 additions and 157 deletions.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
},
"devDependencies": {
"@babel/core": "7.14.0",
"@ember/test-helpers": "2.2.5",
"broccoli-stew": "3.0.0",
"ember-cli": "3.26.1",
"ember-cli-dependency-checker": "3.2.0",
Expand All @@ -39,7 +40,7 @@
"ember-disable-prototype-extensions": "1.1.3",
"ember-load-initializers": "2.1.2",
"ember-maybe-import-regenerator": "0.1.6",
"ember-qunit": "4.6.0",
"ember-qunit": "5.1.4",
"ember-resolver": "8.0.2",
"ember-source": "3.27.0",
"ember-source-channel-url": "3.0.0",
Expand All @@ -52,6 +53,7 @@
"loader.js": "4.7.0",
"mocha": "8.3.2",
"multidep": "2.0.2",
"qunit": "2.15.0",
"qunit-dom": "1.6.0"
},
"engines": {
Expand Down
7 changes: 7 additions & 0 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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
4 changes: 4 additions & 0 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import Application from '../app';
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';

setup(QUnit.assert);

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

Expand Down
Loading

0 comments on commit 9510095

Please sign in to comment.