From 203ecf61e4e67a6dc84906fc96eca192dfeac862 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Mon, 4 Aug 2025 19:25:02 +0100 Subject: [PATCH] refactor: extract cloud runner test helpers --- jest.config.js | 5 +---- .../cloud-runner-github-checks-integration-test.ts | 12 +----------- .../tests/cloud-runner-github-checks.test.ts | 14 +++----------- src/test-utils/cloud-runner-test-helpers.ts | 10 ++++++++++ 4 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 src/test-utils/cloud-runner-test-helpers.ts diff --git a/jest.config.js b/jest.config.js index 14da7ad0..8eed1dd1 100644 --- a/jest.config.js +++ b/jest.config.js @@ -25,9 +25,6 @@ module.exports = { // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader modulePathIgnorePatterns: ['/lib/', '/dist/'], - // A list of paths to modules that run some code before each test file - setupFiles: ['/src/jest.globals.ts'], - // A list of paths to modules that run some code to configure or set up the testing framework after the environment is ready - setupFilesAfterEnv: ['/src/jest.setup.ts'], + setupFilesAfterEnv: ['/src/jest.globals.ts', '/src/jest.setup.ts'], }; diff --git a/src/integration/cloud-runner-github-checks-integration-test.ts b/src/integration/cloud-runner-github-checks-integration-test.ts index 5cf0e384..be5a70b5 100644 --- a/src/integration/cloud-runner-github-checks-integration-test.ts +++ b/src/integration/cloud-runner-github-checks-integration-test.ts @@ -1,18 +1,8 @@ // Integration test for exercising real GitHub check creation and updates. -import { BuildParameters } from '../model'; import CloudRunner from '../model/cloud-runner/cloud-runner'; import UnityVersioning from '../model/unity-versioning'; -import { Cli } from '../model/cli/cli'; import GitHub from '../model/github'; -import { OptionValues } from 'commander'; - -export const TIMEOUT_INFINITE = 1e9; - -async function createParameters(overrides?: OptionValues) { - if (overrides) Cli.options = overrides; - - return BuildParameters.create(); -} +import { TIMEOUT_INFINITE, createParameters } from '../test-utils/cloud-runner-test-helpers'; const runIntegration = process.env.RUN_GITHUB_INTEGRATION_TESTS === 'true'; const describeOrSkip = runIntegration ? describe : describe.skip; diff --git a/src/model/cloud-runner/tests/cloud-runner-github-checks.test.ts b/src/model/cloud-runner/tests/cloud-runner-github-checks.test.ts index e55e43cc..dbae58cf 100644 --- a/src/model/cloud-runner/tests/cloud-runner-github-checks.test.ts +++ b/src/model/cloud-runner/tests/cloud-runner-github-checks.test.ts @@ -1,16 +1,8 @@ -import { BuildParameters } from '../..'; import CloudRunner from '../cloud-runner'; import UnityVersioning from '../../unity-versioning'; -import { Cli } from '../../cli/cli'; import setups from './cloud-runner-suite.test'; -import { OptionValues } from 'commander'; import GitHub from '../../github'; -export const TIMEOUT_INFINITE = 1e9; -async function CreateParameters(overrides: OptionValues | undefined) { - if (overrides) Cli.options = overrides; - - return BuildParameters.create(); -} +import { TIMEOUT_INFINITE, createParameters } from '../../../test-utils/cloud-runner-test-helpers'; describe('Cloud Runner Github Checks', () => { setups(); it('Responds', () => {}); @@ -36,7 +28,7 @@ describe('Cloud Runner Github Checks', () => { 'Check Handling Direct', async () => { // Setup parameters - const buildParameter = await CreateParameters({ + const buildParameter = await createParameters({ versioning: 'None', projectPath: 'test-project', unityVersion: UnityVersioning.read('test-project'), @@ -54,7 +46,7 @@ describe('Cloud Runner Github Checks', () => { 'Check Handling Via Async Workflow', async () => { // Setup parameters - const buildParameter = await CreateParameters({ + const buildParameter = await createParameters({ versioning: 'None', projectPath: 'test-project', unityVersion: UnityVersioning.read('test-project'), diff --git a/src/test-utils/cloud-runner-test-helpers.ts b/src/test-utils/cloud-runner-test-helpers.ts new file mode 100644 index 00000000..74fb9c9d --- /dev/null +++ b/src/test-utils/cloud-runner-test-helpers.ts @@ -0,0 +1,10 @@ +import { BuildParameters } from '../model'; +import { Cli } from '../model/cli/cli'; +import { OptionValues } from 'commander'; + +export const TIMEOUT_INFINITE = 1e9; + +export async function createParameters(overrides?: OptionValues) { + if (overrides) Cli.options = overrides; + return BuildParameters.create(); +}