From 79052a8a1a4082faecfc47b90a2bebe35c3a19be Mon Sep 17 00:00:00 2001 From: Marine Dunstetter Date: Thu, 11 Apr 2024 17:20:50 +0200 Subject: [PATCH] wip test ci --- pnpm-lock.yaml | 14 +++++++------- tests/addon-template/package.json | 2 +- tests/addon-template/vite.config.mjs | 1 + tests/scenarios/compat-dummy-app-test.ts | 13 ++++++++----- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3280a2e2..ad3d146d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1368,8 +1368,8 @@ importers: specifier: ^7.0.0 version: 7.0.0 ember-qunit: - specifier: ^6.1.1 - version: 6.2.0(@ember/test-helpers@2.9.4)(ember-source@4.6.0)(qunit@2.20.1)(webpack@5.90.3) + specifier: ^7.0.0 + version: 7.0.0(@ember/test-helpers@2.9.4)(ember-source@4.6.0)(qunit@2.20.1)(webpack@5.90.3) ember-resolver: specifier: ^10.1.0 version: 10.1.1(@ember/string@3.1.1)(ember-source@4.6.0) @@ -15769,12 +15769,12 @@ packages: - webpack dev: true - /ember-qunit@6.2.0(@ember/test-helpers@2.9.4)(ember-source@4.6.0)(qunit@2.20.1)(webpack@5.90.3): - resolution: {integrity: sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==} - engines: {node: 14.* || 16.* || >= 18} + /ember-qunit@7.0.0(@ember/test-helpers@2.9.4)(ember-source@4.6.0)(qunit@2.20.1)(webpack@5.90.3): + resolution: {integrity: sha512-KhrndHYEXsHnXvmsGyJLJQ6VCudXaRs5dzPZBsdttZJIhsB6PmYAvq2Q+mh3GRDT/59T/sRDrB3FD3/lATS8aA==} + engines: {node: 16.* || >= 18} peerDependencies: - '@ember/test-helpers': ^2.9.3 - ember-source: '>=3.28' + '@ember/test-helpers': '>=3.0.3' + ember-source: '>=4.0.0' qunit: ^2.13.0 dependencies: '@ember/test-helpers': 2.9.4(@babel/core@7.23.9)(ember-source@4.6.0) diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json index 24fd0436e..f7d8b274c 100644 --- 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 index 29d608377..bca7b9d9e 100644 --- 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 index 6913cf996..2edb1f883 100644 --- 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(); + } }); }); });