diff --git a/jest.config.js b/jest.config.js index e5181af1..66def617 100644 --- a/jest.config.js +++ b/jest.config.js @@ -18,7 +18,7 @@ module.exports = { }, moduleFileExtensions: ['ts', 'js'], setupFiles: ['/test/jest.setup.ts'], - testMatch: ['/src/**/*.spec.ts', '/test/scenarios/**/*.spec.ts'], + testMatch: ['/src/**/*.spec.ts', '/test/integration/**/*.spec.ts'], transform: { '^.+\\.ts$': ['ts-jest', { isolatedModules: true }], }, diff --git a/src/get-context/get-context.spec.ts b/src/get-context/get-context.spec.ts index 77e7e6ab..91cd9b5d 100644 --- a/src/get-context/get-context.spec.ts +++ b/src/get-context/get-context.spec.ts @@ -1,7 +1,7 @@ import 'expect-more-jest'; import { join } from 'path'; -import { createMockEnv } from '../../test/mock-env'; -import { runContextSync } from '../../test/run-context-sync'; +import { createMockEnv } from '../../test/lib/mock-env'; +import { runContextSync } from '../../test/lib/run-context-sync'; import { CWD } from '../constants'; import { NoSourcesFoundError } from '../get-package-json-files/get-file-paths'; diff --git a/src/get-package-json-files/get-file-paths.spec.ts b/src/get-package-json-files/get-file-paths.spec.ts index 3c4bfecb..33bf8b6c 100644 --- a/src/get-package-json-files/get-file-paths.spec.ts +++ b/src/get-package-json-files/get-file-paths.spec.ts @@ -1,8 +1,8 @@ import { pipe } from '@effect/data/Function'; import * as Effect from '@effect/io/Effect'; import 'expect-more-jest'; -import type { MockEnv } from '../../test/mock-env'; -import { createMockEnv } from '../../test/mock-env'; +import type { MockEnv } from '../../test/lib/mock-env'; +import { createMockEnv } from '../../test/lib/mock-env'; import { CWD } from '../constants'; import { createEnv } from '../env/create-env'; import { EnvTag } from '../env/tags'; diff --git a/src/get-package-json-files/get-patterns/get-lerna-patterns.spec.ts b/src/get-package-json-files/get-patterns/get-lerna-patterns.spec.ts index cd5e72bf..8cf61375 100644 --- a/src/get-package-json-files/get-patterns/get-lerna-patterns.spec.ts +++ b/src/get-package-json-files/get-patterns/get-lerna-patterns.spec.ts @@ -1,8 +1,8 @@ import { pipe } from '@effect/data/Function'; import * as O from '@effect/data/Option'; import * as Effect from '@effect/io/Effect'; -import type { MockEnv } from '../../../test/mock-env'; -import { createMockEnv } from '../../../test/mock-env'; +import type { MockEnv } from '../../../test/lib/mock-env'; +import { createMockEnv } from '../../../test/lib/mock-env'; import { createEnv } from '../../env/create-env'; import { EnvTag } from '../../env/tags'; import { getLernaPatterns } from './get-lerna-patterns'; diff --git a/src/get-package-json-files/get-patterns/get-patterns.spec.ts b/src/get-package-json-files/get-patterns/get-patterns.spec.ts index 01d8fed9..b33cbc51 100644 --- a/src/get-package-json-files/get-patterns/get-patterns.spec.ts +++ b/src/get-package-json-files/get-patterns/get-patterns.spec.ts @@ -1,8 +1,8 @@ import { pipe } from '@effect/data/Function'; import * as Effect from '@effect/io/Effect'; import { getPatterns } from '.'; -import type { MockEnv } from '../../../test/mock-env'; -import { createMockEnv } from '../../../test/mock-env'; +import type { MockEnv } from '../../../test/lib/mock-env'; +import { createMockEnv } from '../../../test/lib/mock-env'; import { DEFAULT_CONFIG } from '../../constants'; import { createEnv } from '../../env/create-env'; import { EnvTag } from '../../env/tags'; diff --git a/src/get-package-json-files/get-patterns/get-pnpm-patterns.spec.ts b/src/get-package-json-files/get-patterns/get-pnpm-patterns.spec.ts index 2bbe2eea..a30f2e73 100644 --- a/src/get-package-json-files/get-patterns/get-pnpm-patterns.spec.ts +++ b/src/get-package-json-files/get-patterns/get-pnpm-patterns.spec.ts @@ -1,8 +1,8 @@ import { pipe } from '@effect/data/Function'; import * as O from '@effect/data/Option'; import * as Effect from '@effect/io/Effect'; -import type { MockEnv } from '../../../test/mock-env'; -import { createMockEnv } from '../../../test/mock-env'; +import type { MockEnv } from '../../../test/lib/mock-env'; +import { createMockEnv } from '../../../test/lib/mock-env'; import { createEnv } from '../../env/create-env'; import { EnvTag } from '../../env/tags'; import { getPnpmPatterns } from './get-pnpm-patterns'; diff --git a/src/get-package-json-files/get-patterns/get-yarn-patterns.spec.ts b/src/get-package-json-files/get-patterns/get-yarn-patterns.spec.ts index e6fb289d..6f307c05 100644 --- a/src/get-package-json-files/get-patterns/get-yarn-patterns.spec.ts +++ b/src/get-package-json-files/get-patterns/get-yarn-patterns.spec.ts @@ -1,8 +1,8 @@ import { pipe } from '@effect/data/Function'; import * as O from '@effect/data/Option'; import * as Effect from '@effect/io/Effect'; -import type { MockEnv } from '../../../test/mock-env'; -import { createMockEnv } from '../../../test/mock-env'; +import type { MockEnv } from '../../../test/lib/mock-env'; +import { createMockEnv } from '../../../test/lib/mock-env'; import { createEnv } from '../../env/create-env'; import { EnvTag } from '../../env/tags'; import { getYarnPatterns } from './get-yarn-patterns'; diff --git a/src/get-version-groups/lib/get-highest-version.spec.ts b/src/get-version-groups/lib/get-highest-version.spec.ts index 68a730fd..6c917bcd 100644 --- a/src/get-version-groups/lib/get-highest-version.spec.ts +++ b/src/get-version-groups/lib/get-highest-version.spec.ts @@ -1,6 +1,6 @@ import 'expect-more-jest'; import { Ok } from 'tightrope/result'; -import { shuffle } from '../../../test/shuffle'; +import { shuffle } from '../../../test/lib/shuffle'; import { getHighestVersion } from './get-highest-version'; describe('getHighestVersion', () => { diff --git a/src/get-version-groups/lib/get-lowest-version.spec.ts b/src/get-version-groups/lib/get-lowest-version.spec.ts index 3e918c26..3c6a3b41 100644 --- a/src/get-version-groups/lib/get-lowest-version.spec.ts +++ b/src/get-version-groups/lib/get-lowest-version.spec.ts @@ -1,6 +1,6 @@ import 'expect-more-jest'; import { Ok } from 'tightrope/result'; -import { shuffle } from '../../../test/shuffle'; +import { shuffle } from '../../../test/lib/shuffle'; import { getLowestVersion } from './get-lowest-version'; describe('getLowestVersion', () => { diff --git a/src/strategy/name-and-version-props.spec.ts b/src/strategy/name-and-version-props.spec.ts index d0a44226..376d7188 100644 --- a/src/strategy/name-and-version-props.spec.ts +++ b/src/strategy/name-and-version-props.spec.ts @@ -1,5 +1,5 @@ import { Err, Ok } from 'tightrope/result'; -import { mockPackage } from '../../test/mock'; +import { mockPackage } from '../../test/lib/mock'; import { PackageJsonFile } from '../get-package-json-files/package-json-file'; import { NameAndVersionPropsStrategy } from './name-and-version-props'; diff --git a/src/strategy/named-version-string.spec.ts b/src/strategy/named-version-string.spec.ts index 19d90992..e26d836e 100644 --- a/src/strategy/named-version-string.spec.ts +++ b/src/strategy/named-version-string.spec.ts @@ -1,5 +1,5 @@ import { Err, Ok } from 'tightrope/result'; -import { mockPackage } from '../../test/mock'; +import { mockPackage } from '../../test/lib/mock'; import { PackageJsonFile } from '../get-package-json-files/package-json-file'; import { NamedVersionStringStrategy } from './named-version-string'; diff --git a/src/strategy/unnamed-version-string.spec.ts b/src/strategy/unnamed-version-string.spec.ts index 4b5262fb..613e759f 100644 --- a/src/strategy/unnamed-version-string.spec.ts +++ b/src/strategy/unnamed-version-string.spec.ts @@ -1,5 +1,5 @@ import { Err, Ok } from 'tightrope/result'; -import { mockPackage } from '../../test/mock'; +import { mockPackage } from '../../test/lib/mock'; import { PackageJsonFile } from '../get-package-json-files/package-json-file'; import { UnnamedVersionStringStrategy } from './unnamed-version-string'; diff --git a/src/strategy/versions-by-name.spec.ts b/src/strategy/versions-by-name.spec.ts index 6f36e938..7982a56e 100644 --- a/src/strategy/versions-by-name.spec.ts +++ b/src/strategy/versions-by-name.spec.ts @@ -1,5 +1,5 @@ import { Err, Ok } from 'tightrope/result'; -import { mockPackage } from '../../test/mock'; +import { mockPackage } from '../../test/lib/mock'; import { PackageJsonFile } from '../get-package-json-files/package-json-file'; import { VersionsByNameStrategy } from './versions-by-name'; diff --git a/test/scenarios/format/format-github-shorthand.spec.ts b/test/integration/format/format-github-shorthand.spec.ts similarity index 96% rename from test/scenarios/format/format-github-shorthand.spec.ts rename to test/integration/format/format-github-shorthand.spec.ts index 775ee261..342b2541 100644 --- a/test/scenarios/format/format-github-shorthand.spec.ts +++ b/test/integration/format/format-github-shorthand.spec.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; import { formatCli } from '../../../src/bin-format/format-cli'; -import { mockPackage } from '../../mock'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** "repository" contains a github URL which can be shortened further */ diff --git a/test/scenarios/format/format-protected-shorthand.spec.ts b/test/integration/format/format-protected-shorthand.spec.ts similarity index 96% rename from test/scenarios/format/format-protected-shorthand.spec.ts rename to test/integration/format/format-protected-shorthand.spec.ts index 49988985..571e9a90 100644 --- a/test/scenarios/format/format-protected-shorthand.spec.ts +++ b/test/integration/format/format-protected-shorthand.spec.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; import { formatCli } from '../../../src/bin-format/format-cli'; -import { mockPackage } from '../../mock'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** "repository" contains properties which cannot be shortened */ diff --git a/test/scenarios/format/format-shorthand-properties.spec.ts b/test/integration/format/format-shorthand-properties.spec.ts similarity index 96% rename from test/scenarios/format/format-shorthand-properties.spec.ts rename to test/integration/format/format-shorthand-properties.spec.ts index 80d762fd..eaa19544 100644 --- a/test/scenarios/format/format-shorthand-properties.spec.ts +++ b/test/integration/format/format-shorthand-properties.spec.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; import { formatCli } from '../../../src/bin-format/format-cli'; -import { mockPackage } from '../../mock'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** "bugs" and "repository" can safely use equivalent shorthands */ diff --git a/test/scenarios/format/format-sort-array-props.spec.ts b/test/integration/format/format-sort-array-props.spec.ts similarity index 95% rename from test/scenarios/format/format-sort-array-props.spec.ts rename to test/integration/format/format-sort-array-props.spec.ts index aa606b88..2dc47529 100644 --- a/test/scenarios/format/format-sort-array-props.spec.ts +++ b/test/integration/format/format-sort-array-props.spec.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; import { formatCli } from '../../../src/bin-format/format-cli'; -import { mockPackage } from '../../mock'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** "keywords" array should be A-Z but is not */ diff --git a/test/scenarios/format/format-sort-first.spec.ts b/test/integration/format/format-sort-first.spec.ts similarity index 96% rename from test/scenarios/format/format-sort-first.spec.ts rename to test/integration/format/format-sort-first.spec.ts index ad27d07b..7ecf1f5a 100644 --- a/test/scenarios/format/format-sort-first.spec.ts +++ b/test/integration/format/format-sort-first.spec.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; import { formatCli } from '../../../src/bin-format/format-cli'; -import { mockPackage } from '../../mock'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** F E D should appear first, then the rest in A-Z order */ diff --git a/test/scenarios/format/format-sort-object-props.spec.ts b/test/integration/format/format-sort-object-props.spec.ts similarity index 95% rename from test/scenarios/format/format-sort-object-props.spec.ts rename to test/integration/format/format-sort-object-props.spec.ts index d93c54ce..2847d95d 100644 --- a/test/scenarios/format/format-sort-object-props.spec.ts +++ b/test/integration/format/format-sort-object-props.spec.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; import { formatCli } from '../../../src/bin-format/format-cli'; -import { mockPackage } from '../../mock'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** "scripts" object keys should be A-Z but is not */ diff --git a/test/scenarios/lib/create-scenario.ts b/test/integration/lib/create-scenario.ts similarity index 98% rename from test/scenarios/lib/create-scenario.ts rename to test/integration/lib/create-scenario.ts index 806aa0e1..4f09785a 100644 --- a/test/scenarios/lib/create-scenario.ts +++ b/test/integration/lib/create-scenario.ts @@ -18,13 +18,13 @@ import type { SemverGroupReport } from '../../../src/get-semver-groups'; import { getSemverGroups } from '../../../src/get-semver-groups'; import type { VersionGroupReport } from '../../../src/get-version-groups'; import { getVersionGroups } from '../../../src/get-version-groups'; -import type { MockEnv } from '../../mock-env'; +import type { MockEnv } from '../../lib/mock-env'; import { createMockEnv, createMockErrorHandlers, createMockSemverRangeEffects, createMockVersionEffects, -} from '../../mock-env'; +} from '../../lib/mock-env'; interface MockedFile { absolutePath: string; diff --git a/test/scenarios/semver-groups/asterisk-range-mismatch.spec.ts b/test/integration/semver-groups/asterisk-range-mismatch.spec.ts similarity index 97% rename from test/scenarios/semver-groups/asterisk-range-mismatch.spec.ts rename to test/integration/semver-groups/asterisk-range-mismatch.spec.ts index f0de72a5..b57ec98f 100644 --- a/test/scenarios/semver-groups/asterisk-range-mismatch.spec.ts +++ b/test/integration/semver-groups/asterisk-range-mismatch.spec.ts @@ -3,8 +3,8 @@ import { lintSemverRanges } from '../../../src/bin-lint-semver-ranges/lint-semve import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; import { setSemverRanges } from '../../../src/bin-set-semver-ranges/set-semver-ranges'; -import { toBeSemverRangeMismatch, toBeValid } from '../../matchers/semver-group'; -import { mockPackage } from '../../mock'; +import { toBeSemverRangeMismatch, toBeValid } from '../../lib/matchers/semver-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('semverGroups', () => { diff --git a/test/scenarios/semver-groups/filter.spec.ts b/test/integration/semver-groups/filter.spec.ts similarity index 98% rename from test/scenarios/semver-groups/filter.spec.ts rename to test/integration/semver-groups/filter.spec.ts index 45cd8344..7245da43 100644 --- a/test/scenarios/semver-groups/filter.spec.ts +++ b/test/integration/semver-groups/filter.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; import { setSemverRanges } from '../../../src/bin-set-semver-ranges/set-semver-ranges'; -import { toBeFilteredOut } from '../../matchers/semver-group'; -import { mockPackage } from '../../mock'; +import { toBeFilteredOut } from '../../lib/matchers/semver-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('semverGroups', () => { diff --git a/test/scenarios/semver-groups/ignored.spec.ts b/test/integration/semver-groups/ignored.spec.ts similarity index 98% rename from test/scenarios/semver-groups/ignored.spec.ts rename to test/integration/semver-groups/ignored.spec.ts index 53fd9f02..ae1ec5cc 100644 --- a/test/scenarios/semver-groups/ignored.spec.ts +++ b/test/integration/semver-groups/ignored.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; import { setSemverRanges } from '../../../src/bin-set-semver-ranges/set-semver-ranges'; -import { toBeIgnored } from '../../matchers/semver-group'; -import { mockPackage } from '../../mock'; +import { toBeIgnored } from '../../lib/matchers/semver-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('semverGroups', () => { diff --git a/test/scenarios/semver-groups/issue-84-reproduction.spec.ts b/test/integration/semver-groups/issue-84-reproduction.spec.ts similarity index 91% rename from test/scenarios/semver-groups/issue-84-reproduction.spec.ts rename to test/integration/semver-groups/issue-84-reproduction.spec.ts index 19021ec9..3a4ec6b3 100644 --- a/test/scenarios/semver-groups/issue-84-reproduction.spec.ts +++ b/test/integration/semver-groups/issue-84-reproduction.spec.ts @@ -1,5 +1,5 @@ -import { toBeSemverRangeMismatch } from '../../matchers/semver-group'; -import { mockPackage } from '../../mock'; +import { toBeSemverRangeMismatch } from '../../lib/matchers/semver-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; /** diff --git a/test/scenarios/semver-groups/semver-range-mismatch.spec.ts b/test/integration/semver-groups/semver-range-mismatch.spec.ts similarity index 98% rename from test/scenarios/semver-groups/semver-range-mismatch.spec.ts rename to test/integration/semver-groups/semver-range-mismatch.spec.ts index 1486d967..e22ef906 100644 --- a/test/scenarios/semver-groups/semver-range-mismatch.spec.ts +++ b/test/integration/semver-groups/semver-range-mismatch.spec.ts @@ -4,8 +4,8 @@ import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; import { setSemverRanges } from '../../../src/bin-set-semver-ranges/set-semver-ranges'; import { INTERNAL_TYPES } from '../../../src/constants'; -import { toBeSemverRangeMismatch, toBeValid } from '../../matchers/semver-group'; -import { mockPackage } from '../../mock'; +import { toBeSemverRangeMismatch, toBeValid } from '../../lib/matchers/semver-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('semverGroups', () => { diff --git a/test/scenarios/semver-groups/workspace-range-mismatch.spec.ts b/test/integration/semver-groups/workspace-range-mismatch.spec.ts similarity index 97% rename from test/scenarios/semver-groups/workspace-range-mismatch.spec.ts rename to test/integration/semver-groups/workspace-range-mismatch.spec.ts index 26de6f3c..f72d89a3 100644 --- a/test/scenarios/semver-groups/workspace-range-mismatch.spec.ts +++ b/test/integration/semver-groups/workspace-range-mismatch.spec.ts @@ -3,8 +3,8 @@ import { lintSemverRanges } from '../../../src/bin-lint-semver-ranges/lint-semve import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; import { setSemverRanges } from '../../../src/bin-set-semver-ranges/set-semver-ranges'; -import { toBeLocalPackageSemverRangeMismatch, toBeValid } from '../../matchers/semver-group'; -import { mockPackage } from '../../mock'; +import { toBeLocalPackageSemverRangeMismatch, toBeValid } from '../../lib/matchers/semver-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('semverGroups', () => { diff --git a/test/scenarios/version-groups/banned.spec.ts b/test/integration/version-groups/banned.spec.ts similarity index 98% rename from test/scenarios/version-groups/banned.spec.ts rename to test/integration/version-groups/banned.spec.ts index 144c7234..10f2fab9 100644 --- a/test/scenarios/version-groups/banned.spec.ts +++ b/test/integration/version-groups/banned.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeBanned } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeBanned } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/dependency-types.spec.ts b/test/integration/version-groups/dependency-types.spec.ts similarity index 97% rename from test/scenarios/version-groups/dependency-types.spec.ts rename to test/integration/version-groups/dependency-types.spec.ts index 006e5407..e52a545c 100644 --- a/test/scenarios/version-groups/dependency-types.spec.ts +++ b/test/integration/version-groups/dependency-types.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeIgnored } from '../../matchers/version-group'; +import { toBeIgnored } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/filter.spec.ts b/test/integration/version-groups/filter.spec.ts similarity index 97% rename from test/scenarios/version-groups/filter.spec.ts rename to test/integration/version-groups/filter.spec.ts index d3d0f93a..06195087 100644 --- a/test/scenarios/version-groups/filter.spec.ts +++ b/test/integration/version-groups/filter.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeFilteredOut } from '../../matchers/version-group'; +import { toBeFilteredOut } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/highest-semver-mismatch.spec.ts b/test/integration/version-groups/highest-semver-mismatch.spec.ts similarity index 97% rename from test/scenarios/version-groups/highest-semver-mismatch.spec.ts rename to test/integration/version-groups/highest-semver-mismatch.spec.ts index 01011f48..76175624 100644 --- a/test/scenarios/version-groups/highest-semver-mismatch.spec.ts +++ b/test/integration/version-groups/highest-semver-mismatch.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeHighestSemverMismatch } from '../../matchers/version-group'; +import { toBeHighestSemverMismatch } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/ignored.spec.ts b/test/integration/version-groups/ignored.spec.ts similarity index 97% rename from test/scenarios/version-groups/ignored.spec.ts rename to test/integration/version-groups/ignored.spec.ts index c0e90c24..464a21cd 100644 --- a/test/scenarios/version-groups/ignored.spec.ts +++ b/test/integration/version-groups/ignored.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeIgnored } from '../../matchers/version-group'; +import { toBeIgnored } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/issue-95.spec.ts b/test/integration/version-groups/issue-95.spec.ts similarity index 97% rename from test/scenarios/version-groups/issue-95.spec.ts rename to test/integration/version-groups/issue-95.spec.ts index 21363df7..109af3d6 100644 --- a/test/scenarios/version-groups/issue-95.spec.ts +++ b/test/integration/version-groups/issue-95.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeValid } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeValid } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/lib/create-scenario-variants.ts b/test/integration/version-groups/lib/create-scenario-variants.ts similarity index 98% rename from test/scenarios/version-groups/lib/create-scenario-variants.ts rename to test/integration/version-groups/lib/create-scenario-variants.ts index 7744a6cc..ae3cc235 100644 --- a/test/scenarios/version-groups/lib/create-scenario-variants.ts +++ b/test/integration/version-groups/lib/create-scenario-variants.ts @@ -1,6 +1,6 @@ import type { Ctx } from '../../../../src/get-context'; import { splitNameAndVersion } from '../../../../src/lib/split-name-and-version'; -import { mockPackage } from '../../../mock'; +import { mockPackage } from '../../../lib/mock'; import { createScenario } from '../../lib/create-scenario'; export function createScenarioVariants(options: { diff --git a/test/scenarios/version-groups/lowest-semver-mismatch.spec.ts b/test/integration/version-groups/lowest-semver-mismatch.spec.ts similarity index 97% rename from test/scenarios/version-groups/lowest-semver-mismatch.spec.ts rename to test/integration/version-groups/lowest-semver-mismatch.spec.ts index 2e3a5571..2d2fac78 100644 --- a/test/scenarios/version-groups/lowest-semver-mismatch.spec.ts +++ b/test/integration/version-groups/lowest-semver-mismatch.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeLowestSemverMismatch } from '../../matchers/version-group'; +import { toBeLowestSemverMismatch } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/pinned-match.spec.ts b/test/integration/version-groups/pinned-match.spec.ts similarity index 97% rename from test/scenarios/version-groups/pinned-match.spec.ts rename to test/integration/version-groups/pinned-match.spec.ts index d290a2fb..80e4f04e 100644 --- a/test/scenarios/version-groups/pinned-match.spec.ts +++ b/test/integration/version-groups/pinned-match.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeValid } from '../../matchers/version-group'; +import { toBeValid } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/pinned-mismatch.spec.ts b/test/integration/version-groups/pinned-mismatch.spec.ts similarity index 97% rename from test/scenarios/version-groups/pinned-mismatch.spec.ts rename to test/integration/version-groups/pinned-mismatch.spec.ts index c0b9ac5b..aa8184ed 100644 --- a/test/scenarios/version-groups/pinned-mismatch.spec.ts +++ b/test/integration/version-groups/pinned-mismatch.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBePinnedMismatch } from '../../matchers/version-group'; +import { toBePinnedMismatch } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/same-range-match.spec.ts b/test/integration/version-groups/same-range-match.spec.ts similarity index 97% rename from test/scenarios/version-groups/same-range-match.spec.ts rename to test/integration/version-groups/same-range-match.spec.ts index e2a4c776..e1f18e79 100644 --- a/test/scenarios/version-groups/same-range-match.spec.ts +++ b/test/integration/version-groups/same-range-match.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeValid } from '../../matchers/version-group'; +import { toBeValid } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/same-range-mismatch.spec.ts b/test/integration/version-groups/same-range-mismatch.spec.ts similarity index 97% rename from test/scenarios/version-groups/same-range-mismatch.spec.ts rename to test/integration/version-groups/same-range-mismatch.spec.ts index 04c6e4aa..682981f6 100644 --- a/test/scenarios/version-groups/same-range-mismatch.spec.ts +++ b/test/integration/version-groups/same-range-mismatch.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeSameRangeMismatch } from '../../matchers/version-group'; +import { toBeSameRangeMismatch } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/snapped-to-match.spec.ts b/test/integration/version-groups/snapped-to-match.spec.ts similarity index 98% rename from test/scenarios/version-groups/snapped-to-match.spec.ts rename to test/integration/version-groups/snapped-to-match.spec.ts index cee2f53a..7c5721bb 100644 --- a/test/scenarios/version-groups/snapped-to-match.spec.ts +++ b/test/integration/version-groups/snapped-to-match.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeValid } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeValid } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/snapped-to-mismatch.spec.ts b/test/integration/version-groups/snapped-to-mismatch.spec.ts similarity index 98% rename from test/scenarios/version-groups/snapped-to-mismatch.spec.ts rename to test/integration/version-groups/snapped-to-mismatch.spec.ts index 51688c79..1cb86fae 100644 --- a/test/scenarios/version-groups/snapped-to-mismatch.spec.ts +++ b/test/integration/version-groups/snapped-to-mismatch.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeSnappedToMismatch, toBeValid } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeSnappedToMismatch, toBeValid } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/unsupported-match.spec.ts b/test/integration/version-groups/unsupported-match.spec.ts similarity index 98% rename from test/scenarios/version-groups/unsupported-match.spec.ts rename to test/integration/version-groups/unsupported-match.spec.ts index 500c58e4..d31f6e51 100644 --- a/test/scenarios/version-groups/unsupported-match.spec.ts +++ b/test/integration/version-groups/unsupported-match.spec.ts @@ -4,7 +4,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeValid } from '../../matchers/version-group'; +import { toBeValid } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/unsupported-mismatch.spec.ts b/test/integration/version-groups/unsupported-mismatch.spec.ts similarity index 97% rename from test/scenarios/version-groups/unsupported-mismatch.spec.ts rename to test/integration/version-groups/unsupported-mismatch.spec.ts index 40c340f7..679f8a97 100644 --- a/test/scenarios/version-groups/unsupported-mismatch.spec.ts +++ b/test/integration/version-groups/unsupported-mismatch.spec.ts @@ -5,7 +5,7 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeNonSemverMismatch } from '../../matchers/version-group'; +import { toBeNonSemverMismatch } from '../../lib/matchers/version-group'; import { createScenarioVariants } from './lib/create-scenario-variants'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/workspace-mismatch-nested.spec.ts b/test/integration/version-groups/workspace-mismatch-nested.spec.ts similarity index 98% rename from test/scenarios/version-groups/workspace-mismatch-nested.spec.ts rename to test/integration/version-groups/workspace-mismatch-nested.spec.ts index 8e26055f..be94b176 100644 --- a/test/scenarios/version-groups/workspace-mismatch-nested.spec.ts +++ b/test/integration/version-groups/workspace-mismatch-nested.spec.ts @@ -3,8 +3,8 @@ import { fixMismatches } from '../../../src/bin-fix-mismatches/fix-mismatches'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeLocalPackageMismatch } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeLocalPackageMismatch } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/workspace-mismatch.spec.ts b/test/integration/version-groups/workspace-mismatch.spec.ts similarity index 98% rename from test/scenarios/version-groups/workspace-mismatch.spec.ts rename to test/integration/version-groups/workspace-mismatch.spec.ts index 631c6b8c..d81c6871 100644 --- a/test/scenarios/version-groups/workspace-mismatch.spec.ts +++ b/test/integration/version-groups/workspace-mismatch.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeLocalPackageMismatch } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeLocalPackageMismatch } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/scenarios/version-groups/workspace-usage-match.spec.ts b/test/integration/version-groups/workspace-usage-match.spec.ts similarity index 98% rename from test/scenarios/version-groups/workspace-usage-match.spec.ts rename to test/integration/version-groups/workspace-usage-match.spec.ts index c76607c0..dd96636b 100644 --- a/test/scenarios/version-groups/workspace-usage-match.spec.ts +++ b/test/integration/version-groups/workspace-usage-match.spec.ts @@ -4,8 +4,8 @@ import { lint } from '../../../src/bin-lint/lint'; import { listMismatches } from '../../../src/bin-list-mismatches/list-mismatches'; import { list } from '../../../src/bin-list/list'; import { prompt } from '../../../src/bin-prompt/prompt'; -import { toBeValid } from '../../matchers/version-group'; -import { mockPackage } from '../../mock'; +import { toBeValid } from '../../lib/matchers/version-group'; +import { mockPackage } from '../../lib/mock'; import { createScenario } from '../lib/create-scenario'; describe('versionGroups', () => { diff --git a/test/matchers/semver-group.ts b/test/lib/matchers/semver-group.ts similarity index 95% rename from test/matchers/semver-group.ts rename to test/lib/matchers/semver-group.ts index a5e05615..e2b83079 100644 --- a/test/matchers/semver-group.ts +++ b/test/lib/matchers/semver-group.ts @@ -1,5 +1,5 @@ import 'expect-more-jest'; -import type { SemverGroupReport } from '../../src/get-semver-groups'; +import type { SemverGroupReport } from '../../../src/get-semver-groups'; import { toBeSupportedInstance } from './version-group'; export function toBeFilteredOut({ name }: Pick) { diff --git a/test/matchers/version-group.ts b/test/lib/matchers/version-group.ts similarity index 97% rename from test/matchers/version-group.ts rename to test/lib/matchers/version-group.ts index 5a5dcb92..6cf4e38e 100644 --- a/test/matchers/version-group.ts +++ b/test/lib/matchers/version-group.ts @@ -1,5 +1,5 @@ import 'expect-more-jest'; -import type { VersionGroupReport } from '../../src/get-version-groups'; +import type { VersionGroupReport } from '../../../src/get-version-groups'; export function toBeSupportedInstance() { return expect.objectContaining({ diff --git a/test/mock-env.ts b/test/lib/mock-env.ts similarity index 93% rename from test/mock-env.ts rename to test/lib/mock-env.ts index 77c5de53..a40caf60 100644 --- a/test/mock-env.ts +++ b/test/lib/mock-env.ts @@ -1,6 +1,6 @@ import * as Effect from '@effect/io/Effect'; -import type { SemverRangeEffects, VersionEffects } from '../src/create-program/effects'; -import type { ErrorHandlers } from '../src/error-handlers/create-error-handlers'; +import type { SemverRangeEffects, VersionEffects } from '../../src/create-program/effects'; +import type { ErrorHandlers } from '../../src/error-handlers/create-error-handlers'; export interface MockEnv { readonly askForChoice: jest.Mock; diff --git a/test/mock.ts b/test/lib/mock.ts similarity index 85% rename from test/mock.ts rename to test/lib/mock.ts index 954e4797..d2da5f7b 100644 --- a/test/mock.ts +++ b/test/lib/mock.ts @@ -1,10 +1,10 @@ import { EOL } from 'os'; import { join } from 'path'; -import { CWD } from '../src/constants'; -import { newlines } from '../src/env/write-if-changed'; -import type { JsonFile } from '../src/get-package-json-files/get-patterns/read-json-safe'; -import type { PackageJson } from '../src/get-package-json-files/package-json-file'; -import { splitNameAndVersion } from '../src/lib/split-name-and-version'; +import { CWD } from '../../src/constants'; +import { newlines } from '../../src/env/write-if-changed'; +import type { JsonFile } from '../../src/get-package-json-files/get-patterns/read-json-safe'; +import type { PackageJson } from '../../src/get-package-json-files/package-json-file'; +import { splitNameAndVersion } from '../../src/lib/split-name-and-version'; export const mockPackage = ( dirName: string, diff --git a/test/run-context-sync.ts b/test/lib/run-context-sync.ts similarity index 71% rename from test/run-context-sync.ts rename to test/lib/run-context-sync.ts index 398a3a0e..b9d008e8 100644 --- a/test/run-context-sync.ts +++ b/test/lib/run-context-sync.ts @@ -1,11 +1,11 @@ import * as Context from '@effect/data/Context'; import { pipe } from '@effect/data/Function'; import * as Effect from '@effect/io/Effect'; -import { CliConfigTag } from '../src/config/tag'; -import type { CliConfig } from '../src/config/types'; -import { createEnv } from '../src/env/create-env'; -import { EnvTag } from '../src/env/tags'; -import { getContext } from '../src/get-context'; +import { CliConfigTag } from '../../src/config/tag'; +import type { CliConfig } from '../../src/config/types'; +import { createEnv } from '../../src/env/create-env'; +import { EnvTag } from '../../src/env/tags'; +import { getContext } from '../../src/get-context'; import type { MockEnv } from './mock-env'; export function runContextSync( diff --git a/test/shuffle.ts b/test/lib/shuffle.ts similarity index 100% rename from test/shuffle.ts rename to test/lib/shuffle.ts