Repository: ember-cli/ember-cli
Pull request #9340 (2020-09-23 00:11:45)

Update blueprints with new testing configuration
Updating blueprints to conform to new requirements as per https://github.com/ember-cli/ember-cli/issues/9335.




Patch:
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index ff678b8cf..425894c0c 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -20,7 +20,8 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@ember/optional-features": "^2.0.0<% if (embroider) { %>",
+    "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0<% if (embroider) { %>",
     "@embroider/compat": "^0.27.0",
     "@embroider/core": "^0.27.0",
     "@embroider/webpack": "^0.27.0<% } %>",
@@ -42,7 +43,7 @@
     "ember-fetch": "^8.0.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0<% if (welcome) { %>",
@@ -52,7 +53,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"


Test patch:
diff --git a/blueprints/app/files/tests/index.html b/blueprints/app/files/tests/index.html
index 140695b91..0f191fece 100644
--- a/blueprints/app/files/tests/index.html
+++ b/blueprints/app/files/tests/index.html
@@ -20,6 +20,13 @@
   <body>
     {{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>
diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
index 275cba5ff..e3fadcbbc 100644
--- a/tests/fixtures/addon/defaults/package.json
+++ b/tests/fixtures/addon/defaults/package.json
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
@@ -42,7 +43,7 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
@@ -53,7 +54,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
index cfe028d27..45560b042 100644
--- a/tests/fixtures/addon/yarn/package.json
+++ b/tests/fixtures/addon/yarn/package.json
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
@@ -42,7 +43,7 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
@@ -54,7 +55,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
index 618194140..2ae4618dc 100644
--- a/tests/fixtures/app/defaults/package.json
+++ b/tests/fixtures/app/defaults/package.json
@@ -21,6 +21,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
@@ -39,7 +40,7 @@
     "ember-fetch": "^8.0.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
@@ -49,7 +50,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json
index 758223991..fa489436b 100644
--- a/tests/fixtures/app/embroider-no-welcome/package.json
+++ b/tests/fixtures/app/embroider-no-welcome/package.json
@@ -21,6 +21,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@embroider/compat": "^0.27.0",
     "@embroider/core": "^0.27.0",
     "@embroider/webpack": "^0.27.0",
@@ -42,7 +43,7 @@
     "ember-fetch": "^8.0.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
@@ -51,7 +52,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json
index ba8300e63..27f6b9a22 100644
--- a/tests/fixtures/app/embroider/package.json
+++ b/tests/fixtures/app/embroider/package.json
@@ -21,6 +21,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@embroider/compat": "^0.27.0",
     "@embroider/core": "^0.27.0",
     "@embroider/webpack": "^0.27.0",
@@ -42,7 +43,7 @@
     "ember-fetch": "^8.0.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
@@ -52,7 +53,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index 7217e7d17..d1635932c 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -21,6 +21,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
@@ -39,7 +40,7 @@
     "ember-fetch": "^8.0.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
@@ -48,7 +49,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index 618194140..2ae4618dc 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -21,6 +21,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
@@ -39,7 +40,7 @@
     "ember-fetch": "^8.0.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
@@ -49,7 +50,8 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.5.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"