wip test ci

embroider-build · Apr 11, 2024 · 79052a8 · 79052a8
1 parent ab54df6
commit 79052a8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json
@@ -53,7 +53,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.1.1",
+    "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~4.6.0",
     "ember-source-channel-url": "^3.0.0",

diff --git a/tests/addon-template/vite.config.mjs b/tests/addon-template/vite.config.mjs
@@ -44,6 +44,7 @@ export default defineConfig(({ mode }) => {
         ignored: ["!**/node_modules/.embroider/rewritten-app/**"],
       },
     },
+    publicDir: resolve(process.cwd(), "public"),
     build: {
       outDir: resolve(process.cwd(), "dist"),
       rollupOptions: {

diff --git a/tests/scenarios/compat-dummy-app-test.ts b/tests/scenarios/compat-dummy-app-test.ts
@@ -87,11 +87,14 @@ dummyAppScenarios
 
       test('contains public assets from dummy app in dev mode', async function (assert) {
         const server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
-        const [, url] = await server.waitFor(/Local:\s+(http:\/\/127.0.0.1:\d+)\//);
-        let response = await fetch(`${url}/robots.txt`);
-        let text = await response.text();
-        assert.strictEqual(text, 'go away bots');
-        await server.shutdown();
+        try {
+          const [, url] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
+          let response = await fetch(`${url}/robots.txt`);
+          let text = await response.text();
+          assert.strictEqual(text, 'go away bots');
+        } finally {
+          await server.shutdown();
+        }
       });
     });
   });