Skip to content

Commit

Permalink
Merge pull request #1077 from emberjs/melsumner/update-ember-test-hel…
Browse files Browse the repository at this point in the history 
…pers
  • Loading branch information
@MelSumner
MelSumner committed Jun 10, 2023
2 parents 22f928b + 12f7731 commit 07aa3ca
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 99 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
fail-fast: true
matrix:
ember-try-scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-release
Expand Down
2 changes: 1 addition & 1 deletion addon-test-support/adapter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function unhandledRejectionAssertion(current, error) {
message = error;
source = 'unknown source';
} else {
message = 'unhandledRejection occured, but it had no message';
message = 'unhandledRejection occurred, but it had no message';
source = 'unknown source';
}

Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.19.1",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.9.3",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.0.3",
"@embroider/test-setup": "^2.1.1",
"@glimmer/component": "^1.1.2",
"@tsconfig/ember": "^2.0.0",
Expand Down Expand Up @@ -83,12 +84,12 @@
"webpack": "^5.75.0"
},
"peerDependencies": {
"@ember/test-helpers": "^2.9.3",
"ember-source": ">=3.28",
"@ember/test-helpers": ">=3.0.3",
"ember-source": ">=4.0.0",
"qunit": "^2.13.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": "16.* || >= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -125,7 +126,7 @@
}
},
"volta": {
"node": "14.19.1",
"yarn": "1.22.18"
"node": "18.16.0",
"yarn": "1.22.19"
}
}
41 changes: 19 additions & 22 deletions types/tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import {
setResolver,
setupRenderingTest,
setupTest,
SetupTestOptions,
setupApplicationTest,
} from 'ember-qunit';
import { render, RenderingTestContext, TestContext } from '@ember/test-helpers';
import { render, TestContext } from '@ember/test-helpers';
import EmberResolver from 'ember-resolver';
import EmberObject from '@ember/object';

Expand All @@ -25,30 +24,28 @@ setResolver(EmberResolver.create());
module('rendering', function (hooks) {
setupRenderingTest(hooks);

test('it renders', function (this: RenderingTestContext, assert) {
test('it renders', async function (assert) {
assert.expect(2);

// setup the outer context
this.set('value', 'cat');

// render the component
this.render(hbs`
await render(hbs`
{{ x-foo value=value action="result" }}
`);

// has to be a template
// @ts-expect-error
this.render();
// @ts-expect-error
this.render('{{ x-foo value=value action="result" }}');
await render(hbs);

await render(hbs`{{ x-foo value=value action="result" data-test-content}}`);

const el = this.element.querySelector('div');
assert.equal(el?.innerText, 'cat', 'The component shows the correct value');
assert.equal('[data-test-content]', 'cat', 'The component shows the correct value');

this.element.querySelector('button')?.click();
});

test('it renders', async function (this: RenderingTestContext, assert) {
// this test doesn't make sense, but it also doesn't fail, so I'm setting it to skip until we can improve it.
skip('it renders', async function (assert) {
assert.expect(1);

// creates the component instance
Expand All @@ -70,8 +67,8 @@ module('rendering', function (hooks) {
const inputFormat2 = this.get('inputFormat');

// render the component on the page
this.render(hbs`<div>bar</div>`);
assert.equal(this.element.querySelector('div')?.innerText, 'bar');
await render(hbs`<div data-test-content>bar</div>`);
assert.equal('[data-test-content]', 'bar');
});
});

Expand All @@ -97,10 +94,10 @@ module('misc and async', function (hooks) {
// This test is intended to ensure the appropriate behavior for @typescript-eslint/no-misused-promises.
// However, we don't actually use typescript-eslint in this project and tslint has no equivalent,
// so we can't properly test it.
test('it can be async', async function (this: RenderingTestContext, assert) {
test('it can be async', async function (assert) {
assert.expect(1);

await this.render(hbs`<p>Hello</p>`);
await render(hbs`<p>Hello</p>`);

assert.ok(true, 'rendered');
});
Expand All @@ -112,10 +109,10 @@ module('misc and async', function (hooks) {
// This test is intended to ensure the appropriate behavior for @typescript-eslint/no-misused-promises.
// However, we don't actually use typescript-eslint in this project and tslint has no equivalent,
// so we can't properly test it.
skip('it can skip async', async function (this: RenderingTestContext, assert) {
skip('it can skip async', async function (assert) {
assert.expect(1);

await this.render(hbs`<p>Hello</p>`);
await render(hbs`<p>Hello</p>`);

assert.ok(true, 'rendered');
});
Expand All @@ -125,10 +122,10 @@ module('misc and async', function (hooks) {
// so we can't properly test it.
only(
'it can only run async',
async function (this: RenderingTestContext, assert) {
async function (assert) {
assert.expect(1);

await this.render(hbs`<p>Hello</p>`);
await render(hbs`<p>Hello</p>`);

assert.ok(true, 'rendered');
}
Expand All @@ -139,10 +136,10 @@ module('misc and async', function (hooks) {
// so we can't properly test it.
todo(
'it can have an async todo',
async function (this: RenderingTestContext, assert) {
async function (assert) {
assert.expect(1);

await this.render(hbs`<p>Hello</p>`);
await render(hbs`<p>Hello</p>`);

assert.ok(true, 'rendered');
}
Expand Down
133 changes: 64 additions & 69 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1037,21 +1037,27 @@
mkdirp "^1.0.4"
silent-error "^1.1.1"

"@ember/test-helpers@^2.9.3":
version "2.9.3"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.3.tgz#c2a9d6ab1c367af92cf1a334f97eb19b8e06e6e1"
integrity sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==
"@ember/string@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
dependencies:
ember-cli-babel "^7.26.6"

"@ember/test-helpers@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-3.0.3.tgz#4d278ebc4576fbf5ff5a2643978f2d310d2656cc"
integrity sha512-W8fEWritv36W216wmuusOlsUJs+iDFkOvHratI8tw466NV4deq9TVej1p5DtUFeDUUP/E14IxqrNNC3qaYszfQ==
dependencies:
"@ember/test-waiters" "^3.0.0"
"@ember/test-waiters" "^3.0.2"
"@embroider/macros" "^1.10.0"
"@embroider/util" "^1.9.0"
broccoli-debug "^0.6.5"
broccoli-funnel "^3.0.8"
ember-auto-import "^2.6.0"
ember-cli-babel "^7.26.11"
ember-cli-htmlbars "^6.1.1"
ember-destroyable-polyfill "^2.0.3"
ember-cli-htmlbars "^6.2.0"

"@ember/test-waiters@^3.0.0":
"@ember/test-waiters@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f"
integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ==
Expand All @@ -1061,7 +1067,7 @@
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"

"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.9.0":
"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
Expand Down Expand Up @@ -1097,15 +1103,6 @@
lodash "^4.17.21"
resolve "^1.20.0"

"@embroider/util@^1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
dependencies:
"@embroider/macros" "^1.9.0"
broccoli-funnel "^3.0.5"
ember-cli-babel "^7.23.1"

"@eslint/eslintrc@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.0.tgz#943309d8697c52fc82c076e90c1c74fbbe69dbff"
Expand Down Expand Up @@ -2194,7 +2191,7 @@ available-typed-arrays@^1.0.5:
resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==

babel-import-util@^1.1.0, babel-import-util@^1.2.0:
babel-import-util@^1.1.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495"
integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==
Expand Down Expand Up @@ -2242,23 +2239,20 @@ babel-plugin-ember-modules-api-polyfill@^3.5.0:
dependencies:
ember-rfc176-data "^0.3.17"

babel-plugin-ember-template-compilation@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.2.tgz#e0695b8ad5a8fe6b2cbdff1eadb01cf402731ad6"
integrity sha512-4HBMksmlYsWEf/C/n3uW5rkBRbUp4FNaspzdQTAHgLbfCJnkLze8R6i6sUSge48y/Wne7mx+vcImI1o6rlUwXQ==
dependencies:
babel-import-util "^1.2.0"
line-column "^1.0.2"
magic-string "^0.26.0"
string.prototype.matchall "^4.0.5"

babel-plugin-ember-template-compilation@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57"
integrity sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g==
dependencies:
babel-import-util "^1.3.0"

babel-plugin-ember-template-compilation@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.3.tgz#8370e92eabc9987354eb7e3a84f6d5cf1d19b365"
integrity sha512-SIetZD/uCLnzIBTJtzYGc2Q55TPqM5WyjuOgW+Is1W3SZVljlY3JD5Add29hDMs//OvXBWoXfOopQxkfG4/pIA==
dependencies:
babel-import-util "^1.3.0"

babel-plugin-filter-imports@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"
Expand Down Expand Up @@ -2650,7 +2644,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
symlink-or-copy "^1.0.0"
walk-sync "^0.3.1"

broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
broccoli-funnel@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
Expand Down Expand Up @@ -3889,12 +3883,49 @@ ember-auto-import@^2.4.1, ember-auto-import@^2.6.1:
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^3.0.0"

ember-auto-import@^2.6.0:
version "2.6.3"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
dependencies:
"@babel/core" "^7.16.7"
"@babel/plugin-proposal-class-properties" "^7.16.7"
"@babel/plugin-proposal-decorators" "^7.16.7"
"@babel/preset-env" "^7.16.7"
"@embroider/macros" "^1.0.0"
"@embroider/shared-internals" "^2.0.0"
babel-loader "^8.0.6"
babel-plugin-ember-modules-api-polyfill "^3.5.0"
babel-plugin-ember-template-compilation "^2.0.1"
babel-plugin-htmlbars-inline-precompile "^5.2.1"
babel-plugin-syntax-dynamic-import "^6.18.0"
broccoli-debug "^0.6.4"
broccoli-funnel "^3.0.8"
broccoli-merge-trees "^4.2.0"
broccoli-plugin "^4.0.0"
broccoli-source "^3.0.0"
css-loader "^5.2.0"
debug "^4.3.1"
fs-extra "^10.0.0"
fs-tree-diff "^2.0.0"
handlebars "^4.3.1"
js-string-escape "^1.0.1"
lodash "^4.17.19"
mini-css-extract-plugin "^2.5.2"
parse5 "^6.0.1"
resolve "^1.20.0"
resolve-package-path "^4.0.3"
semver "^7.3.4"
style-loader "^2.0.0"
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^3.0.0"

ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==

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.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
version "7.26.11"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
Expand Down Expand Up @@ -3946,26 +3977,6 @@ ember-cli-get-component-path-option@^1.0.0:
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==

ember-cli-htmlbars@^6.1.1:
version "6.1.1"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
dependencies:
"@ember/edition-utils" "^1.2.0"
babel-plugin-ember-template-compilation "^1.0.0"
babel-plugin-htmlbars-inline-precompile "^5.3.0"
broccoli-debug "^0.6.5"
broccoli-persistent-filter "^3.1.2"
broccoli-plugin "^4.0.3"
ember-cli-version-checker "^5.1.2"
fs-tree-diff "^2.0.1"
hash-for-dep "^1.5.1"
heimdalljs-logger "^0.1.10"
js-string-escape "^1.0.1"
semver "^7.3.4"
silent-error "^1.1.1"
walk-sync "^2.2.0"

ember-cli-htmlbars@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
Expand Down Expand Up @@ -4222,7 +4233,7 @@ ember-cli@~4.10.0:
workerpool "^6.2.1"
yam "^1.0.0"

ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.1:
ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.2:
version "1.2.6"
resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
Expand All @@ -4233,15 +4244,6 @@ ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.2, ember-co
fs-extra "^9.1.0"
semver "^5.4.1"

ember-destroyable-polyfill@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1"
integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==
dependencies:
ember-cli-babel "^7.22.1"
ember-cli-version-checker "^5.1.1"
ember-compatibility-helpers "^1.2.1"

ember-disable-prototype-extensions@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
Expand Down Expand Up @@ -7281,13 +7283,6 @@ magic-string@^0.25.7:
dependencies:
sourcemap-codec "^1.4.8"

magic-string@^0.26.0:
version "0.26.7"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
dependencies:
sourcemap-codec "^1.4.8"

make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
Expand Down

0 comments on commit 07aa3ca

Please sign in to comment.