Merge pull request #2175 from embroider-build/adjust-ember-qunit-vers…

…ions Adjust ember-qunit versions in test suite
embroider-build · Nov 15, 2024 · aaeb674 · aaeb674
2 parents 7195610 + 40f2d0b
commit aaeb674
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 42 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/app-template/package.json b/tests/app-template/package.json
@@ -61,7 +61,7 @@
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^7.0.0",
+    "ember-qunit": "^8.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "5.11.0",
     "ember-template-lint": "^5.10.1",

diff --git a/tests/scenarios/compat-addon-classic-features-test.ts b/tests/scenarios/compat-addon-classic-features-test.ts
@@ -187,13 +187,31 @@ appScenarios
     let myAddon = baseAddon();
     myAddon.pkg.name = 'my-addon';
     merge(myAddon.files, {
+      'index.js': `
+        module.exports = {
+          name: require('./package').name,
+          included() {
+            this._super.included.apply(this, arguments);
+            this.import('vendor/my-addon/test-styles.css', {
+              type: 'test',
+            });
+          }
+        };
+      `,
       addon: {
         styles: {
           'addon.css': `
             .my-addon-p { color: blue; }
           `,
         },
       },
+      vendor: {
+        'my-addon': {
+          'test-styles.css': `
+            #example-test-styles { background-color: red }
+          `,
+        },
+      },
     });
     project.addDependency(myAddon);
   })
@@ -232,7 +250,7 @@ appScenarios
           })
         );
         assert.true(readResult.some(content => content.includes('.my-addon-p{color:#00f}')));
-        assert.true(readResult.some(content => content.includes('#qunit-tests')));
+        assert.true(readResult.some(content => content.includes('#example-test-styles')));
       });
 
       test('virtual styles are served in dev mode', async function (assert) {
@@ -246,7 +264,7 @@ appScenarios
 
           response = await fetch(`${url}/@embroider/virtual/test-support.css?direct`);
           text = await response.text();
-          assert.true(text.includes('#qunit-tests'));
+          assert.true(text.includes('#example-test-styles'));
         } finally {
           await server.shutdown();
         }

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
@@ -85,7 +85,7 @@
     "ember-inline-svg": "^0.2.1",
     "ember-modifier": "^4.0.0",
     "ember-page-title": "^8.2.3",
-    "ember-qunit-7": "npm:ember-qunit@^7.0.0",
+    "ember-qunit-6": "npm:ember-qunit@^6.0.0",
     "ember-source": "~3.28.11",
     "ember-source-4.12": "npm:ember-source@~4.12.0",
     "ember-source-4.4": "npm:ember-source@~4.4.0",

diff --git a/tests/scenarios/scenarios.ts b/tests/scenarios/scenarios.ts
@@ -6,6 +6,7 @@ export async function lts_3_28(project: Project) {
   project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli' });
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });
   project.linkDevDependency('@ember/test-helpers', { baseDir: __dirname, resolveName: 'ember-test-helpers-2' });
+  project.linkDevDependency('ember-qunit', { baseDir: __dirname, resolveName: 'ember-qunit-6' });
 }
 
 async function lts_4_4(project: Project) {
@@ -47,7 +48,6 @@ async function release(project: Project) {
   project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-latest' });
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });
   project.linkDevDependency('@ember/test-waiters', { baseDir: __dirname, resolveName: '@ember/test-waiters' });
-  project.linkDevDependency('ember-qunit', { baseDir: __dirname, resolveName: 'ember-qunit-7' });
   project.linkDevDependency('ember-cli-babel', { baseDir: __dirname, resolveName: 'ember-cli-babel-latest' });
   project.linkDevDependency('@babel/core', { baseDir: __dirname });
 }
@@ -56,7 +56,6 @@ async function beta(project: Project) {
   project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-beta' });
   project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-beta' });
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });
-  project.linkDevDependency('ember-qunit', { baseDir: __dirname, resolveName: 'ember-qunit-7' });
   project.linkDevDependency('ember-cli-babel', { baseDir: __dirname, resolveName: 'ember-cli-babel-latest' });
   project.linkDevDependency('@babel/core', { baseDir: __dirname });
 }
@@ -65,7 +64,6 @@ async function canary(project: Project) {
   project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-canary' });
   project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-beta' });
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });
-  project.linkDevDependency('ember-qunit', { baseDir: __dirname, resolveName: 'ember-qunit-7' });
   project.linkDevDependency('ember-cli-babel', { baseDir: __dirname, resolveName: 'ember-cli-babel-latest' });
 }