add test fixes for no-test-entrypoint branch

packages/core/src/app-files.ts

@@ -9,7 +9,6 @@ export interface RouteFiles {
 }
 
 export class AppFiles {
-  readonly tests: ReadonlyArray<string>;
   readonly components: ReadonlyArray<string>;
   readonly helpers: ReadonlyArray<string>;
   readonly modifiers: ReadonlyArray<string>;
@@ -26,7 +25,6 @@ export class AppFiles {
     staticAppPathsPattern: RegExp | undefined,
     podModulePrefix?: string
   ) {
-    let tests: string[] = [];
     let components: string[] = [];
     let helpers: string[] = [];
     let modifiers: string[] = [];
@@ -78,7 +76,7 @@ export class AppFiles {
       }
 
       if (relativePath.startsWith('tests/')) {
-        tests.push(relativePath);
+        // skip tests because they are dealt with separately
         continue;
       }
 
@@ -134,7 +132,6 @@ export class AppFiles {
         otherAppFiles.push(relativePath);
       }
     }
-    this.tests = tests;
     this.components = components;
     this.helpers = helpers;
     this.modifiers = modifiers;

test-packages/sample-transforms/tests/index.html

@@ -32,9 +32,14 @@
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
     <script src="/@embroider/core/entrypoint" type="module"></script>
-    <script src="/@embroider/core/test-entrypoint" type="module"></script>
+    <script type="module">import "ember-testing";</script>
+
+    <script type="module">
+      import { start } from './test-helper';
+      import.meta.glob("./**/*.{js,gjs,gts}", { eager: true });
+      start();
+    </script>
 
     {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
   </body>
 </html>

test-packages/sample-transforms/tests/test-helper.js

@@ -3,10 +3,12 @@ import config from 'dummy/config/environment';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';
-import { start } from 'ember-qunit';
+import { start as qunitStart } from 'ember-qunit';
 
-setApplication(Application.create(config.APP));
+export function start() {
+  setApplication(Application.create(config.APP));
 
-setup(QUnit.assert);
+  setup(QUnit.assert);
 
-start();
+  qunitStart();
+}

tests/addon-template/tests/index.html

@@ -30,9 +30,14 @@
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/@embroider/core/test-entrypoint" type="module"></script>
+    <script type="module">import "ember-testing";</script>
+
+    <script type="module">
+      import { start } from './test-helper';
+      import.meta.glob("./**/*.{js,gjs,gts}", { eager: true });
+      start();
+    </script>
 
     {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
   </body>
 </html>

tests/addon-template/tests/test-helper.js

@@ -3,10 +3,12 @@ import config from 'dummy/config/environment';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';
-import { start } from 'ember-qunit';
+import { start as qunitStart } from 'ember-qunit';
 
-setApplication(Application.create(config.APP));
+export function start() {
+  setApplication(Application.create(config.APP));
 
-setup(QUnit.assert);
+  setup(QUnit.assert);
 
-start();
+  qunitStart();
+}

tests/app-template/tests/index.html

@@ -31,7 +31,7 @@
 
     <script type="module">
       import { start } from './test-helper';
-      import.meta.glob("./**/*.js", { eager: true });
+      import.meta.glob("./**/*.{js,gjs,gts}", { eager: true });
       start();
     </script>
 

tests/fixtures/macro-sample-addon-classic/tests/test-helper.js

@@ -0,0 +1,12 @@
+import Application from 'dummy/app';
+import config from 'dummy/config/environment';
+import * as QUnit from 'qunit';
+import { setApplication } from '@ember/test-helpers';
+import { setup } from 'qunit-dom';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create(config.APP));
+
+setup(QUnit.assert);
+
+start();

tests/fixtures/macro-sample-addon/tests/index.html

@@ -30,9 +30,14 @@
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/@embroider/core/test-entrypoint" type="module"></script>
+    <script type="module">import "ember-testing";</script>
+
+    <script type="module">
+      import { start } from './test-helper';
+      import.meta.glob("./**/*.{js,gjs,gts}", { eager: true });
+      start();
+    </script>
 
     {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
   </body>
 </html>

tests/fixtures/macro-sample-addon/tests/test-helper.js

@@ -3,11 +3,13 @@ import config from 'dummy/config/environment';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';
-import { start } from 'ember-qunit';
+import { start as qunitStart } from 'ember-qunit';
 
-window.LoadedFromCustomAppBoot = true;
-setApplication(Application.create(config.APP));
+export function start() {
+  window.LoadedFromCustomAppBoot = true;
+  setApplication(Application.create(config.APP));
 
-setup(QUnit.assert);
+  setup(QUnit.assert);
 
-start();
+  qunitStart();
+}

tests/fixtures/macro-test-classic/tests/test-helper.js

@@ -0,0 +1,12 @@
+import Application from 'app-template/app';
+import config from 'app-template/config/environment';
+import * as QUnit from 'qunit';
+import { setApplication } from '@ember/test-helpers';
+import { setup } from 'qunit-dom';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create(config.APP));
+
+setup(QUnit.assert);
+
+start();

tests/fixtures/macro-test/tests/index.html

@@ -36,9 +36,14 @@
     <script src="{{rootURL}}apple.js"></script>
     <script src="{{rootURL}}ordered.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/@embroider/core/test-entrypoint" type="module"></script>
+    <script type="module">import "ember-testing";</script>
+
+    <script type="module">
+      import { start } from './test-helper';
+      import.meta.glob("./**/*.{js,gjs,gts}", { eager: true });
+      start();
+    </script>
 
     {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
   </body>
-</html>
+</html>

tests/scenarios/macro-test.ts

@@ -108,7 +108,7 @@ appScenarios
   });
 
 appScenarios
-  .map('macro-tests-classic', project => {
+  .map('classic-macro-tests', project => {
     scenarioSetup(project);
     merge(project.files, loadFromFixtureData('macro-test-classic'));
   })
@@ -120,7 +120,7 @@ appScenarios
         app = await scenario.prepare();
       });
 
-      test(`EMBROIDER_TEST_SETUP_FORCE=classic pnpm test`, async function (assert) {
+      test(`EMBROIDER_TEST_SETUP_FORCE=classic pnpm ember test`, async function (assert) {
         // throw_unless_parallelizable is enabled to ensure that @embroider/macros is parallelizable
         let result = await app.execute(`pnpm ember test`, {
           env: {

tests/ts-app-template/tests/index.html

@@ -30,9 +30,14 @@
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/@embroider/core/test-entrypoint" type="module"></script>
+    <script type="module">import "ember-testing";</script>
+
+    <script type="module">
+      import { start } from './test-helper';
+      import.meta.glob("./**/*.{js,gjs,gts}", { eager: true });
+      start();
+    </script>
 
     {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
   </body>
 </html>

tests/ts-app-template/tests/test-helper.ts

@@ -3,10 +3,12 @@ import config from 'ts-app-template/config/environment';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';
-import { start } from 'ember-qunit';
+import { start as qunitStart } from 'ember-qunit';
 
-setApplication(Application.create(config.APP));
+export function start() {
+  setApplication(Application.create(config.APP));
 
-setup(QUnit.assert);
+  setup(QUnit.assert);
 
-start();
+  qunitStart();
+}