From b994e9e69343596b4324426852573ea411584850 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 14 Oct 2024 13:21:29 +0100 Subject: [PATCH 1/4] ci: run test suite on windows --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fc89ff9..dc4a99fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,10 @@ on: jobs: ci: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 - run: corepack enable From 391e9f0d0e959c02d841bc615201bc55e277725d Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 14 Oct 2024 14:33:12 +0100 Subject: [PATCH 2/4] test: use `node:os` for assertion --- test/e2e.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e.spec.ts b/test/e2e.spec.ts index f07c79b9..d70700b4 100644 --- a/test/e2e.spec.ts +++ b/test/e2e.spec.ts @@ -1,5 +1,6 @@ import { createServer } from 'node:http' import { fileURLToPath } from 'node:url' +import os from 'node:os' import { getRandomPort } from 'get-port-please' import { createApp, readBody, toNodeListener, defineEventHandler } from 'h3' @@ -15,7 +16,7 @@ const app = createApp().use(defineEventHandler(async (event) => { delete body.context.nodeVersion expect(body.context.nuxtVersion).toBeDefined() delete body.context.nuxtVersion - expect(body.context.os).toEqual(process.platform) + expect(body.context.os).toEqual(os.type()) delete body.context.os expect(body.context.projectHash).toBeDefined() expect(body.context.projectSession).toBeDefined() From a8811283cc79a21dbd406426d2b5bda79493205a Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 14 Oct 2024 14:37:06 +0100 Subject: [PATCH 3/4] chore: oops --- test/e2e.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e.spec.ts b/test/e2e.spec.ts index d70700b4..42483a6f 100644 --- a/test/e2e.spec.ts +++ b/test/e2e.spec.ts @@ -16,7 +16,7 @@ const app = createApp().use(defineEventHandler(async (event) => { delete body.context.nodeVersion expect(body.context.nuxtVersion).toBeDefined() delete body.context.nuxtVersion - expect(body.context.os).toEqual(os.type()) + expect(body.context.os).toEqual(os.type().toLocaleLowerCase()) delete body.context.os expect(body.context.projectHash).toBeDefined() expect(body.context.projectSession).toBeDefined() From 48d9b2ace9b0afb85778758b2096a931a20d2f48 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 14 Oct 2024 14:45:45 +0100 Subject: [PATCH 4/4] chore: enable pnpm's shell emulator --- .npmrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.npmrc b/.npmrc index bf2e7648..5a85963b 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,3 @@ shamefully-hoist=true +shell-emulator=true +