From e45d6c2040dfb301d7a7d11eb528a8172e7960ba Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Thu, 9 Jun 2022 16:59:52 -0700 Subject: [PATCH 1/5] chore: add cross platform integration tests --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0838f6669..22ccfe32f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,8 @@ jobs: matrix: os: - ubuntu-latest + - macos-latest + - windows-latest node: - 14 From b40738365d7a1fe6f1adea7f05813609e66ed508 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Thu, 9 Jun 2022 17:10:30 -0700 Subject: [PATCH 2/5] chore: increase test timeout for mac --- packages/cli/test/acceptance/kill-orphans-test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cli/test/acceptance/kill-orphans-test.js b/packages/cli/test/acceptance/kill-orphans-test.js index f8dbe8fc6..9a5f29109 100644 --- a/packages/cli/test/acceptance/kill-orphans-test.js +++ b/packages/cli/test/acceptance/kill-orphans-test.js @@ -8,6 +8,8 @@ const exec = promisify(require('child_process').exec); const { startWebDriver } = require('../../../remote/src'); describe(function() { + this.timeout(5e3); + it('works', async function() { let webDriver = await startWebDriver({ overrides: { From 0f5afdd85155e31eb5750c2838ba5a47eb8c7938 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Fri, 10 Jun 2022 17:44:20 -0700 Subject: [PATCH 3/5] chore: use node to invoke --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e32d109e4..4dd718d56 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lint:md": "remark -f doc CONTRIBUTING.md README.md packages/*/README.md examples/*/README.md packages/lint/doc", "release": "next release --default-branch main --scripts.precommit \"FALTEST_PRINT_VERSION=false yargs-help-output README.md --npm-script-name start && git add README.md\" --scripts.postbump \"\\\"$PWD/scripts/postbump.js\\\"\" --no-bump-in-range-dependencies", "start": "faltest", - "test": "./scripts/run.js packages test", + "test": "node scripts/run.js packages test", "test:acceptance": "mocha" }, "repository": { From 23f72e8b548de9a18ca296df0deaf023dcad7371 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Fri, 10 Jun 2022 17:49:31 -0700 Subject: [PATCH 4/5] chore: increase test timeout for windows --- packages/cli/test/acceptance/kill-orphans-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/test/acceptance/kill-orphans-test.js b/packages/cli/test/acceptance/kill-orphans-test.js index 9a5f29109..323f73081 100644 --- a/packages/cli/test/acceptance/kill-orphans-test.js +++ b/packages/cli/test/acceptance/kill-orphans-test.js @@ -8,7 +8,7 @@ const exec = promisify(require('child_process').exec); const { startWebDriver } = require('../../../remote/src'); describe(function() { - this.timeout(5e3); + this.timeout(10e3); it('works', async function() { let webDriver = await startWebDriver({ From 6f5478ff07a868144250a0eb93e0c16b1d95ffef Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Fri, 10 Jun 2022 17:53:41 -0700 Subject: [PATCH 5/5] chore: support windows --- packages/cli/test/fixtures/bin.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/cli/test/fixtures/bin.js b/packages/cli/test/fixtures/bin.js index 73020e9fa..6055bf622 100644 --- a/packages/cli/test/fixtures/bin.js +++ b/packages/cli/test/fixtures/bin.js @@ -2,4 +2,10 @@ process.env.FALTEST_CONFIG_DIR = __dirname; -require('../../../../node_modules/.bin/faltest'); +let bin = 'faltest'; + +if (process.platform === 'win32') { + bin += '.cmd'; +} + +require(`../../../../node_modules/.bin/${bin}`);