Skip to content

Commit c984a99

Browse files
authored
Merge pull request #77 from ember-learn/update-ember-to-v3.23
Updated ember-source to v3.23.1
2 parents 4c3d353 + bdea152 commit c984a99

File tree

5 files changed

+2116
-2085
lines changed

5 files changed

+2116
-2085
lines changed

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.20.0",
6+
"version": "3.23.0",
77
"blueprints": [
88
{
99
"name": "app",

package.json

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,49 +21,50 @@
2121
"lint:hbs": "ember-template-lint ./*.hbs app",
2222
"lint:js": "eslint ./*.js app config tests",
2323
"start": "ember serve",
24-
"test": "npm-run-all test:*",
25-
"test:ember": "percy exec -- ember test"
24+
"test": "percy exec -- ember test"
2625
},
2726
"devDependencies": {
28-
"@ember/optional-features": "^1.3.0",
29-
"@glimmer/component": "^1.0.1",
30-
"@glimmer/tracking": "^1.0.1",
31-
"@percy/ember": "^2.1.3",
27+
"@ember/optional-features": "^2.0.0",
28+
"@ember/test-helpers": "^2.1.4",
29+
"@glimmer/component": "^1.0.3",
30+
"@glimmer/tracking": "^1.0.3",
31+
"@percy/ember": "^2.1.4",
3232
"babel-eslint": "^10.1.0",
3333
"broccoli-asset-rev": "^3.0.0",
34-
"ember-auto-import": "^1.6.0",
35-
"ember-cli": "~3.20.0",
36-
"ember-cli-app-version": "^3.2.0",
37-
"ember-cli-babel": "^7.21.0",
34+
"ember-auto-import": "^1.10.1",
35+
"ember-cli": "~3.23.0",
36+
"ember-cli-app-version": "^4.0.0",
37+
"ember-cli-babel": "^7.23.0",
3838
"ember-cli-dependency-checker": "^3.2.0",
39-
"ember-cli-dependency-lint": "^1.1.3",
39+
"ember-cli-dependency-lint": "^2.0.0",
4040
"ember-cli-deploy": "^1.0.2",
4141
"ember-cli-deploy-build": "^2.0.0",
4242
"ember-cli-deploy-git": "^1.3.4",
4343
"ember-cli-fastboot": "^2.2.1",
44-
"ember-cli-htmlbars": "^5.2.0",
44+
"ember-cli-htmlbars": "^5.3.1",
4545
"ember-cli-inject-live-reload": "^2.0.2",
4646
"ember-cli-sri": "^2.1.1",
47-
"ember-cli-uglify": "^3.0.0",
47+
"ember-cli-terser": "^4.0.1",
4848
"ember-code-snippet": "^3.0.0",
4949
"ember-export-application-global": "^2.0.1",
5050
"ember-fetch": "^8.0.2",
51-
"ember-intl": "^5.4.2",
52-
"ember-load-initializers": "^2.1.1",
51+
"ember-intl": "^5.6.0",
52+
"ember-load-initializers": "^2.1.2",
5353
"ember-maybe-import-regenerator": "^0.1.6",
54-
"ember-prism": "^0.8.0",
55-
"ember-qunit": "^4.6.0",
54+
"ember-prism": "^0.9.0",
55+
"ember-qunit": "^5.1.1",
5656
"ember-resolver": "^8.0.2",
57-
"ember-source": "~3.20.2",
58-
"ember-template-lint": "^2.11.0",
59-
"ember-test-selectors": "^4.1.0",
60-
"eslint": "^7.7.0",
61-
"eslint-plugin-ember": "^8.13.0",
57+
"ember-source": "~3.23.1",
58+
"ember-template-lint": "^2.15.0",
59+
"ember-test-selectors": "^5.0.0",
60+
"eslint": "^7.16.0",
61+
"eslint-plugin-ember": "^10.0.2",
6262
"eslint-plugin-node": "^11.1.0",
6363
"loader.js": "^4.7.0",
6464
"npm-run-all": "^4.1.5",
6565
"prember": "^1.0.5",
66-
"qunit-dom": "^1.4.0"
66+
"qunit": "^2.13.0",
67+
"qunit-dom": "^1.6.0"
6768
},
6869
"engines": {
6970
"node": "10.* || >= 12"

tests/index.html

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

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+
2431
<script src="/testem.js" integrity=""></script>
2532
<script src="{{rootURL}}assets/vendor.js"></script>
2633
<script src="{{rootURL}}assets/test-support.js"></script>

tests/test-helper.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ import Application from 'ember-octane-vs-classic-cheat-sheet/app';
22
import config from 'ember-octane-vs-classic-cheat-sheet/config/environment';
33
import { setApplication } from '@ember/test-helpers';
44
import { start } from 'ember-qunit';
5+
import * as QUnit from 'qunit';
6+
import { setup } from 'qunit-dom';
7+
8+
setup(QUnit.assert);
59

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

0 commit comments

Comments
 (0)