fix old ember-try scenarios

Author: mansona

package.json

@@ -38,6 +38,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "5.2.2",
     "@ember/test-waiters": "^4.1.0",
+    "@embroider/macros": "^1.18.0",
     "@embroider/test-setup": "^3.0.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -53,7 +54,7 @@
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^9.0.2",
-    "ember-qunit": "~9.0.3",
+    "ember-qunit": "^9.0.3",
     "ember-resolver": "^13.1.1",
     "ember-source": "~5.4.0",
     "ember-source-channel-url": "^3.0.0",

pnpm-lock.yaml

@@ -11,17 +11,31 @@ module.exports = async function () {
       {
         name: 'ember-lts-3.28',
         npm: {
+          // this needs to be in dependencies because @embroider/macros dependencySatisfies
+          // can only look at dependencies and not dev dependencies
+          dependencies: {
+            'ember-qunit': '~8.0.0',
+          },
           devDependencies: {
             'ember-source': '~3.28.0',
             'ember-cli': '^4.12.0',
+            '@ember/test-helpers': '^3.0.0',
+            '@ember/test-waiters': '^3.0.0',
           },
         },
       },
       {
         name: 'ember-lts-4.4',
         npm: {
+          // this needs to be in dependencies because @embroider/macros dependencySatisfies
+          // can only look at dependencies and not dev dependencies
+          dependencies: {
+            'ember-qunit': '~8.0.0',
+          },
           devDependencies: {
             'ember-source': '~4.4.0',
+            '@ember/test-helpers': '^3.0.0',
+            '@ember/test-waiters': '^3.0.0',
           },
         },
       },
@@ -81,10 +95,17 @@ module.exports = async function () {
           }),
         },
         npm: {
+          // this needs to be in dependencies because @embroider/macros dependencySatisfies
+          // can only look at dependencies and not dev dependencies
+          dependencies: {
+            'ember-qunit': '~8.0.0',
+          },
           devDependencies: {
             'ember-source': '~3.28.0',
             '@ember/jquery': '^2.0.0',
             'ember-cli': '^4.12.0',
+            '@ember/test-helpers': '^3.0.0',
+            '@ember/test-waiters': '^3.0.0',
           },
         },
       },
@@ -98,9 +119,16 @@ module.exports = async function () {
           }),
         },
         npm: {
+          // this needs to be in dependencies because @embroider/macros dependencySatisfies
+          // can only look at dependencies and not dev dependencies
+          dependencies: {
+            'ember-qunit': '~8.0.0',
+          },
           devDependencies: {
             'ember-source': '~3.28.0',
             'ember-cli': '^4.12.0',
+            '@ember/test-helpers': '^3.0.0',
+            '@ember/test-waiters': '^3.0.0',
           },
           ember: {
             edition: 'classic',

tests/dummy/config/ember-try.js

@@ -3,9 +3,18 @@ import config from 'dummy/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { loadTests } from 'ember-qunit/test-loader';
 import { start, setupEmberOnerrorValidation } from 'ember-qunit';
+import { dependencySatisfies } from '@embroider/macros';
 
 setupEmberOnerrorValidation();
-loadTests();
+
+/**
+ * We only need to explicitly call load tests when we're on a newer ember-qunit. This check is here
+ * because we have an ember-try setup that tests ember versions that aren't supported on the newer
+ * ember-qunit so we need to downgrade ember-qunit for them too
+ */
+if (!dependencySatisfies('ember-qunit', '<9.0.0')) {
+  loadTests();
+}
 setApplication(Application.create(config.APP));
 
 start();