Skip to content

Commit

Permalink
test(files): reorganise test files
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieMason committed Aug 21, 2023
1 parent d8a4eaa commit cf805f7
Show file tree
Hide file tree
Showing 51 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'js'],
setupFiles: ['<rootDir>/test/jest.setup.ts'],
testMatch: ['<rootDir>/src/**/*.spec.ts', '<rootDir>/test/scenarios/**/*.spec.ts'],
testMatch: ['<rootDir>/src/**/*.spec.ts', '<rootDir>/test/integration/**/*.spec.ts'],
transform: {
'^.+\\.ts$': ['ts-jest', { isolatedModules: true }],
},
Expand Down
4 changes: 2 additions & 2 deletions src/get-context/get-context.spec.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions src/get-package-json-files/get-file-paths.spec.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/get-package-json-files/get-patterns/get-patterns.spec.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/get-version-groups/lib/get-highest-version.spec.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/get-version-groups/lib/get-lowest-version.spec.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/strategy/name-and-version-props.spec.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/strategy/named-version-string.spec.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/strategy/unnamed-version-string.spec.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/strategy/versions-by-name.spec.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down

0 comments on commit cf805f7

Please sign in to comment.