From 296b8dd567614e8b84d9724423c09bf264a170ff Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 20 Jan 2023 11:55:37 -0500 Subject: [PATCH 1/5] reduce windows coverage --- .github/workflows/ci.yml | 5 +---- packages/kit/package.json | 2 +- packages/kit/test/prerendering/basics/package.json | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9667e4bc31d4..10eae61e1208 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,9 +42,6 @@ jobs: - node-version: 16 os: ubuntu-latest e2e-browser: 'chromium' - - node-version: 16 - os: windows-latest - e2e-browser: 'chromium' - node-version: 18 os: ubuntu-latest e2e-browser: 'chromium' @@ -81,7 +78,7 @@ jobs: matrix: include: - node-version: 16 - os: ubuntu-latest + os: windows-2019 e2e-browser: 'firefox' - node-version: 16 os: macOS-latest diff --git a/packages/kit/package.json b/packages/kit/package.json index 0dd87bfda560..78ef9884e654 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -63,7 +63,7 @@ "format": "pnpm lint --write", "test": "pnpm test:unit && pnpm test:integration", "test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test", - "test:cross-browser": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-browser", + "test:cross-browser": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-browser", "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"", "postinstall": "node postinstall.js" }, diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json index 5840e56a9a2a..e74bdcb24b7e 100644 --- a/packages/kit/test/prerendering/basics/package.json +++ b/packages/kit/test/prerendering/basics/package.json @@ -7,7 +7,8 @@ "build": "vite build", "preview": "vite preview", "check": "svelte-kit sync && tsc && svelte-check", - "test": "svelte-kit sync && pnpm build && uvu test" + "test": "svelte-kit sync && pnpm build && uvu test", + "test:cross-browser": "pnpm test" }, "devDependencies": { "@sveltejs/kit": "workspace:^", From bfec712666703c1e21afc3d10a1274ffb4ba39ef Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 20 Jan 2023 14:26:58 -0500 Subject: [PATCH 2/5] test build errors --- packages/kit/test/build-errors/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/kit/test/build-errors/package.json b/packages/kit/test/build-errors/package.json index 6038b86f8249..8b7499014304 100644 --- a/packages/kit/test/build-errors/package.json +++ b/packages/kit/test/build-errors/package.json @@ -3,7 +3,8 @@ "private": true, "version": "0.0.0-next.0", "scripts": { - "test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"" + "test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"", + "test:cross-browser": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"" }, "type": "module", "devDependencies": { From 464b0519a82505511d206b2ca9c27669a09f1fe5 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 20 Jan 2023 15:49:59 -0500 Subject: [PATCH 3/5] cross-browser -> cross-platform --- .github/workflows/ci.yml | 8 ++++---- package.json | 2 +- packages/kit/package.json | 2 +- packages/kit/test/apps/basics/package.json | 6 +++--- packages/kit/test/apps/basics/test/client.test.js | 2 +- .../test/{cross-browser => cross-platform}/client.test.js | 0 .../basics/test/{cross-browser => cross-platform}/test.js | 0 packages/kit/test/apps/basics/test/test.js | 2 +- packages/kit/test/build-errors/package.json | 2 +- packages/kit/test/prerendering/basics/package.json | 2 +- turbo.json | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename packages/kit/test/apps/basics/test/{cross-browser => cross-platform}/client.test.js (100%) rename packages/kit/test/apps/basics/test/{cross-browser => cross-platform}/test.js (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10eae61e1208..8c59cea98121 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,15 +96,15 @@ jobs: cache: pnpm - run: pnpm install --frozen-lockfile - run: pnpm playwright install ${{ matrix.e2e-browser }} - - run: pnpm test:cross-browser + - run: pnpm test:cross-platform - name: Archive test results if: failure() shell: bash - run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-browser.tar.gz --files-from=- + run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-platform.tar.gz --files-from=- - name: Upload test results if: failure() uses: actions/upload-artifact@v3 with: retention-days: 3 - name: test-failure-cross-browser-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }} - path: test-results-cross-browser.tar.gz + name: test-failure-cross-platform-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }} + path: test-results-cross-platform.tar.gz diff --git a/package.json b/package.json index 21c67345197a..53fd55a0bdb4 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "test": "turbo run test --filter=./packages/*", - "test:cross-browser": "turbo run test:cross-browser --filter=./packages/*", + "test:cross-platform": "turbo run test:cross-platform --filter=./packages/*", "test:vite-ecosystem-ci": "pnpm test --dir packages/kit", "check": "turbo run check", "lint": "turbo run lint", diff --git a/packages/kit/package.json b/packages/kit/package.json index 78ef9884e654..e783e8cafd5e 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -63,7 +63,7 @@ "format": "pnpm lint --write", "test": "pnpm test:unit && pnpm test:integration", "test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test", - "test:cross-browser": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-browser", + "test:cross-platform": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform", "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"", "postinstall": "node postinstall.js" }, diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json index 0fe2c3750a4a..2b602cbf6a10 100644 --- a/packages/kit/test/apps/basics/package.json +++ b/packages/kit/test/apps/basics/package.json @@ -10,9 +10,9 @@ "test": "node test/setup.js && pnpm test:dev && pnpm test:build", "test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test", "test:build": "rimraf test/errors.json && playwright test", - "test:cross-browser": "npm run test:cross-browser:dev && npm run test:cross-browser:build", - "test:cross-browser:dev": "node test/setup.js && rimraf test/errors.json && cross-env DEV=true playwright test test/cross-browser/", - "test:cross-browser:build": "node test/setup.js && rimraf test/errors.json && playwright test test/cross-browser/" + "test:cross-platform": "npm run test:cross-platform:dev && npm run test:cross-platform:build", + "test:cross-platform:dev": "node test/setup.js && rimraf test/errors.json && cross-env DEV=true playwright test test/cross-platform/", + "test:cross-platform:build": "node test/setup.js && rimraf test/errors.json && playwright test test/cross-platform/" }, "devDependencies": { "@sveltejs/kit": "workspace:^", diff --git a/packages/kit/test/apps/basics/test/client.test.js b/packages/kit/test/apps/basics/test/client.test.js index 91b4beec802a..45a63fc7bf7f 100644 --- a/packages/kit/test/apps/basics/test/client.test.js +++ b/packages/kit/test/apps/basics/test/client.test.js @@ -227,7 +227,7 @@ test.describe('Load', () => { } if (!process.env.DEV) { - test.skip('does not fetch __data.json if no server load function exists', async ({ + test.only('does not fetch __data.json if no server load function exists', async ({ page, clicknav }) => { diff --git a/packages/kit/test/apps/basics/test/cross-browser/client.test.js b/packages/kit/test/apps/basics/test/cross-platform/client.test.js similarity index 100% rename from packages/kit/test/apps/basics/test/cross-browser/client.test.js rename to packages/kit/test/apps/basics/test/cross-platform/client.test.js diff --git a/packages/kit/test/apps/basics/test/cross-browser/test.js b/packages/kit/test/apps/basics/test/cross-platform/test.js similarity index 100% rename from packages/kit/test/apps/basics/test/cross-browser/test.js rename to packages/kit/test/apps/basics/test/cross-platform/test.js diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js index 86bb1cdade87..8c477321d9b4 100644 --- a/packages/kit/test/apps/basics/test/test.js +++ b/packages/kit/test/apps/basics/test/test.js @@ -1016,7 +1016,7 @@ test.describe('Actions', () => { test.describe.serial('Cookies API', () => { // there's a problem running these tests in the CI with webkit, // since AFAICT the browser is using http://localhost and webkit won't - // set a `Secure` cookie on that. So we don't run these cross-browser + // set a `Secure` cookie on that. So we don't run these cross-platform test('sanity check for cookies', async ({ page }) => { await page.goto('/cookies'); diff --git a/packages/kit/test/build-errors/package.json b/packages/kit/test/build-errors/package.json index 8b7499014304..e294d46edc80 100644 --- a/packages/kit/test/build-errors/package.json +++ b/packages/kit/test/build-errors/package.json @@ -4,7 +4,7 @@ "version": "0.0.0-next.0", "scripts": { "test": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"", - "test:cross-browser": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"" + "test:cross-platform": "uvu . \"(spec\\.js|test[\\\\/]index\\.js)\"" }, "type": "module", "devDependencies": { diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json index e74bdcb24b7e..34810ff86422 100644 --- a/packages/kit/test/prerendering/basics/package.json +++ b/packages/kit/test/prerendering/basics/package.json @@ -8,7 +8,7 @@ "preview": "vite preview", "check": "svelte-kit sync && tsc && svelte-check", "test": "svelte-kit sync && pnpm build && uvu test", - "test:cross-browser": "pnpm test" + "test:cross-platform": "pnpm test" }, "devDependencies": { "@sveltejs/kit": "workspace:^", diff --git a/turbo.json b/turbo.json index 044145cfdc64..e07e1e8cf14a 100644 --- a/turbo.json +++ b/turbo.json @@ -49,7 +49,7 @@ "outputMode": "new-only", "env": ["CI", "TURBO_CACHE_KEY"] }, - "test:cross-browser": { + "test:cross-platform": { "inputs": ["src/**", "scripts/**", "shared/**", "templates/**", "test/**"], "outputs": ["coverage/", "test-results/**"], "outputMode": "new-only", From fdde41fed20f4f2745d7a042e6d994bb10536fa8 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 20 Jan 2023 15:51:15 -0500 Subject: [PATCH 4/5] oops --- packages/kit/test/apps/basics/test/client.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/test/apps/basics/test/client.test.js b/packages/kit/test/apps/basics/test/client.test.js index 45a63fc7bf7f..91b4beec802a 100644 --- a/packages/kit/test/apps/basics/test/client.test.js +++ b/packages/kit/test/apps/basics/test/client.test.js @@ -227,7 +227,7 @@ test.describe('Load', () => { } if (!process.env.DEV) { - test.only('does not fetch __data.json if no server load function exists', async ({ + test.skip('does not fetch __data.json if no server load function exists', async ({ page, clicknav }) => { From ad35f20efd8adf370cac374fec73d4995cf8a087 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 20 Jan 2023 17:52:53 -0500 Subject: [PATCH 5/5] Update .github/workflows/ci.yml Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c59cea98121..1e96eb26a6e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: matrix: include: - node-version: 16 - os: windows-2019 + os: windows-2019 # slowness reported on newer versions https://github.com/actions/runner-images/issues/5166 e2e-browser: 'firefox' - node-version: 16 os: macOS-latest