.github/workflows/ci.yml

@@ -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

CHANGELOG.md

@@ -1,5 +1,20 @@
 
 
+
+## v7.0.0 (2023-06-12)
+
+#### :boom: Breaking Change
+* [#1077](https://github.com/emberjs/ember-qunit/pull/1077) Upgrade ember-test-helpers and node ([@MelSumner](https://github.com/MelSumner))
+
+#### :house: Internal
+* [#1077](https://github.com/emberjs/ember-qunit/pull/1077) Upgrade ember-test-helpers and node ([@MelSumner](https://github.com/MelSumner))
+* [#1028](https://github.com/emberjs/ember-qunit/pull/1028) Release 6.2.0 ([@chriskrycho](https://github.com/chriskrycho))
+
+#### Committers: 2
+- Chris Krycho ([@chriskrycho](https://github.com/chriskrycho))
+- Melanie Sumner ([@MelSumner](https://github.com/MelSumner))
+
+
 ## v6.2.0 (2023-02-25)
 
 #### :rocket: Enhancement

addon-test-support/adapter.js

@@ -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';
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-qunit",
-  "version": "6.2.0",
+  "version": "7.0.0",
   "description": "QUnit helpers for testing Ember.js applications",
   "keywords": [
     "ember-addon"
@@ -38,18 +38,19 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^3.0.2",
     "common-tags": "^1.8.0",
-    "ember-auto-import": "^2.6.0",
+    "ember-auto-import": "^2.6.1",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-test-loader": "^3.0.0",
     "resolve-package-path": "^4.0.3",
     "silent-error": "^1.1.1",
     "validate-peer-dependencies": "^2.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.5",
+    "@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",
@@ -67,28 +68,28 @@
     "ember-source": "~4.10.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0",
-    "eslint": "^8.33.0",
+    "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "expect-type": "^0.15.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "2.8.3",
+    "prettier": "2.8.4",
     "qunit": "^2.19.4",
-    "release-it": "^15.6.0",
+    "release-it": "^15.7.0",
     "release-it-lerna-changelog": "^5.0.0",
     "typescript": "^4.9.5",
     "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"
@@ -125,7 +126,7 @@
     }
   },
   "volta": {
-    "node": "14.19.1",
-    "yarn": "1.22.18"
+    "node": "18.16.0",
+    "yarn": "1.22.19"
   }
 }

types/tests.ts

@@ -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';
 
@@ -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
@@ -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');
   });
 });
 
@@ -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');
   });
@@ -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');
   });
@@ -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');
     }
@@ -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');
     }