Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit 25d5384

Browse files
NullVoxPopuliNullVoxPopuli
committed
Upgrade qunit setup for @glimmer/component
1 parent 137dd4f commit 25d5384

File tree

6 files changed

+87
-6
lines changed

6 files changed

+87
-6
lines changed

‎packages/@glimmer/component/config/optional-features.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"application-template-wrapper": false,
3+
"default-async-observers": true,
4+
"jquery-integration": false,
5+
"template-only-glimmer-components": true
6+
}

‎packages/@glimmer/component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
},
4343
"devDependencies": {
4444
"@ember/optional-features": "^2.0.0",
45+
"@ember/test-helpers": "^2.6.0",
4546
"@glimmer/application-test-helpers": "^1.0.0",
4647
"@glimmer/compiler": "0.84.0",
4748
"@glimmer/interfaces": "0.84.0",
@@ -50,7 +51,6 @@
5051
"@glimmer/wire-format": "0.84.0",
5152
"@types/ember": "~4.0.0",
5253
"@types/ember-qunit": "~5.0.0",
53-
"@types/ember-test-helpers": "~1.0.6",
5454
"@types/ember-testing-helpers": "^0.0.4",
5555
"@types/ember__test-helpers": "~2.6.1",
5656
"@types/qunit": "^2.5.3",

‎packages/@glimmer/component/test/ember/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>

‎packages/@glimmer/component/test/ember/test-helper.js

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

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

‎packages/@glimmer/component/tests/dummy/config/optional-features.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"application-template-wrapper": false,
3+
"jquery-integration": false,
4+
"template-only-glimmer-components": true
5+
}

‎yarn.lock

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,28 @@
10591059
mkdirp "^1.0.4"
10601060
silent-error "^1.1.1"
10611061

1062+
"@ember/test-helpers@^2.6.0":
1063+
version "2.6.0"
1064+
resolved "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-2.6.0.tgz#d687515c6ab49ba72717fc62046970ef4a72ea9c"
1065+
integrity sha512-N5sr3layWk60wB3maCy+/5hFHQRcTh8aqxcZTSs3Od9QkuHdWBtRgMGLP/35mXpJlgWuu3xqLpt6u3dGHc8gCg==
1066+
dependencies:
1067+
"@ember/test-waiters" "^3.0.0"
1068+
broccoli-debug "^0.6.5"
1069+
broccoli-funnel "^3.0.8"
1070+
ember-cli-babel "^7.26.6"
1071+
ember-cli-htmlbars "^5.7.1"
1072+
ember-destroyable-polyfill "^2.0.3"
1073+
1074+
"@ember/test-waiters@^3.0.0":
1075+
version "3.0.1"
1076+
resolved "https://registry.npmjs.org/@ember/test-waiters/-/test-waiters-3.0.1.tgz#c3416dd6dcb0e3c0434e815e1de144d848ad74b1"
1077+
integrity sha512-LqV55mMiSuhAAWfbJdJf0bxHc22A/CiG8TKyZwpcSv4A1GJIpdlTvqHCrlcdV6T30+L0/uyj14upC3ayWmV0CQ==
1078+
dependencies:
1079+
calculate-cache-key-for-tree "^2.0.0"
1080+
ember-cli-babel "^7.26.6"
1081+
ember-cli-version-checker "^5.1.2"
1082+
semver "^7.3.5"
1083+
10621084
"@embroider/macros@^1.0.0":
10631085
version "1.2.0"
10641086
resolved "https://registry.npmjs.org/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
@@ -2665,7 +2687,14 @@ ajv@^8.0.0, ajv@^8.8.0:
26652687
require-from-string "^2.0.2"
26662688
uri-js "^4.2.2"
26672689

2668-
amd-name-resolver@1.2.0, amd-name-resolver@^1.3.1, "amd-name-resolver@https://github.com/ember-cli/amd-name-resolver.git":
2690+
amd-name-resolver@1.2.0:
2691+
version "1.2.0"
2692+
resolved "https://registry.npmjs.org/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679"
2693+
integrity sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==
2694+
dependencies:
2695+
ensure-posix-path "^1.0.1"
2696+
2697+
amd-name-resolver@^1.3.1:
26692698
version "1.3.1"
26702699
resolved "https://github.com/ember-cli/amd-name-resolver.git#f471c372fb21ec5b795e414cc95f04b80ae53351"
26712700
dependencies:
@@ -3287,7 +3316,7 @@ babel-plugin-filter-imports@^4.0.0:
32873316
"@babel/types" "^7.7.2"
32883317
lodash "^4.17.15"
32893318

3290-
babel-plugin-htmlbars-inline-precompile@^5.2.0, babel-plugin-htmlbars-inline-precompile@^5.2.1, babel-plugin-htmlbars-inline-precompile@^5.3.0:
3319+
babel-plugin-htmlbars-inline-precompile@^5.0.0, babel-plugin-htmlbars-inline-precompile@^5.2.0, babel-plugin-htmlbars-inline-precompile@^5.2.1, babel-plugin-htmlbars-inline-precompile@^5.3.0:
32913320
version "5.3.1"
32923321
resolved "https://registry.npmjs.org/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.1.tgz#5ba272e2e4b6221522401f5f1d98a73b1de38787"
32933322
integrity sha512-QWjjFgSKtSRIcsBhJmEwS2laIdrA6na8HAlc/pEAhjHgQsah/gMiBFRZvbQTy//hWxR4BMwV7/Mya7q5H8uHeA==
@@ -5997,7 +6026,7 @@ ember-cli-babel@^6.0.0-beta.4:
59976026
ember-cli-version-checker "^2.1.2"
59986027
semver "^5.5.0"
59996028

6000-
ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.6:
6029+
ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.6:
60016030
version "7.26.11"
60026031
resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
60036032
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -6063,6 +6092,28 @@ ember-cli-get-component-path-option@^1.0.0:
60636092
resolved "https://registry.npmjs.org/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
60646093
integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
60656094

6095+
ember-cli-htmlbars@^5.7.1:
6096+
version "5.7.2"
6097+
resolved "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
6098+
integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
6099+
dependencies:
6100+
"@ember/edition-utils" "^1.2.0"
6101+
babel-plugin-htmlbars-inline-precompile "^5.0.0"
6102+
broccoli-debug "^0.6.5"
6103+
broccoli-persistent-filter "^3.1.2"
6104+
broccoli-plugin "^4.0.3"
6105+
common-tags "^1.8.0"
6106+
ember-cli-babel-plugin-helpers "^1.1.1"
6107+
ember-cli-version-checker "^5.1.2"
6108+
fs-tree-diff "^2.0.1"
6109+
hash-for-dep "^1.5.1"
6110+
heimdalljs-logger "^0.1.10"
6111+
json-stable-stringify "^1.0.1"
6112+
semver "^7.3.4"
6113+
silent-error "^1.1.1"
6114+
strip-bom "^4.0.0"
6115+
walk-sync "^2.2.0"
6116+
60666117
ember-cli-htmlbars@^6.0.0:
60676118
version "6.0.1"
60686119
resolved "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-6.0.1.tgz#5487831d477e61682bc867fd138808269e5d2152"
@@ -6319,7 +6370,7 @@ ember-cli@~3.24.0:
63196370
workerpool "^6.0.3"
63206371
yam "^1.0.0"
63216372

6322-
ember-compatibility-helpers@^1.1.2:
6373+
ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.1:
63236374
version "1.2.6"
63246375
resolved "https://registry.npmjs.org/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
63256376
integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
@@ -6330,6 +6381,15 @@ ember-compatibility-helpers@^1.1.2:
63306381
fs-extra "^9.1.0"
63316382
semver "^5.4.1"
63326383

6384+
ember-destroyable-polyfill@^2.0.3:
6385+
version "2.0.3"
6386+
resolved "https://registry.npmjs.org/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1"
6387+
integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==
6388+
dependencies:
6389+
ember-cli-babel "^7.22.1"
6390+
ember-cli-version-checker "^5.1.1"
6391+
ember-compatibility-helpers "^1.2.1"
6392+
63336393
ember-disable-prototype-extensions@^1.1.3:
63346394
version "1.1.3"
63356395
resolved "https://registry.npmjs.org/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"

0 commit comments

Comments
 (0)