Skip to content

Commit

Permalink
chore: fix all the damn paths
Browse files Browse the repository at this point in the history
  • Loading branch information
boneskull committed Jun 12, 2024
1 parent e543ebb commit 2b705e3
Show file tree
Hide file tree
Showing 31 changed files with 153 additions and 191 deletions.
4 changes: 4 additions & 0 deletions packages/midnight-smoker/src/machine/loader/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
export * from './loader-machine-actors';

export * from './loader-machine-types';

export * from './loader-machine';
2 changes: 2 additions & 0 deletions packages/midnight-smoker/src/smoker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import {type PkgManagerDef} from './pkg-manager';
import {BLESSED_PLUGINS, PluginRegistry, isBlessedPlugin} from './plugin';
import {type ReporterDef} from './reporter';

export type {SmokeResults};

/**
* Currently, capabilities are for testing purposes because it's a huge pain to
* make them do much more than that.
Expand Down
6 changes: 3 additions & 3 deletions packages/midnight-smoker/test/e2e/cli-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {type ExecResult} from '#schema/exec-result';
import {isExecaError} from '#util/error-util';
import Debug from 'debug';
import execa, {type NodeOptions} from 'execa';
import stripAnsi from 'strip-ansi';
import {type Merge} from 'type-fest';
import {type ExecResult} from '../../src/schema/exec-result';
import {isExecaError} from '../../src/util/error-util';

const debug = Debug('midnight-smoker:test:cli-helpers');

export const CLI_PATH = require.resolve('../../bin/smoker.js');
export const CLI_PATH = require.resolve('#smoker');

/**
* Options for {@link execSmoker}
Expand Down
4 changes: 2 additions & 2 deletions packages/midnight-smoker/test/e2e/cli.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {type ExecError} from '#error/exec-error';
import {FileManager} from '#util/filemanager';
import path from 'node:path';
import snapshot from 'snap-shot-it';
import unexpected from 'unexpected';
import {type ExecError} from '../../src/error';
import {FileManager} from '../../src/util/filemanager';
import assertions from '../assertions';
import {execSmoker, fixupOutput} from './cli-helpers';

Expand Down
8 changes: 4 additions & 4 deletions packages/midnight-smoker/test/e2e/general.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {DEFAULT_PKG_MANAGER_BIN} from '#constants';
import type {ExecResult} from '#schema/exec-result';
import {FileManager} from '#util/filemanager';
import {resolveFrom} from '#util/loader-util';
import fs from 'node:fs/promises';
import path from 'node:path';
import snapshot from 'snap-shot-it';
import unexpected from 'unexpected';
import {DEFAULT_PKG_MANAGER_BIN} from '../../src/constants';
import type {ExecResult} from '../../src/schema/exec-result';
import {FileManager} from '../../src/util/filemanager';
import {resolveFrom} from '../../src/util/loader-util';
import assertions from '../assertions';
import {execSmoker, fixupOutput} from './cli-helpers';

Expand Down
2 changes: 1 addition & 1 deletion packages/midnight-smoker/test/e2e/lint.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {ExecResult} from '#schema/exec-result';
import path from 'node:path';
import snapshot from 'snap-shot-it';
import unexpected from 'unexpected';
import type {ExecResult} from '../../src/schema/exec-result';
import assertions from '../assertions';
import {execSmoker, fixupOutput} from './cli-helpers';

Expand Down
2 changes: 1 addition & 1 deletion packages/midnight-smoker/test/e2e/plugin-registry.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {PluginRegistry} from '#plugin/plugin-registry';
import unexpected from 'unexpected';
import {PluginRegistry} from '../../src/plugin/plugin-registry';

const expect = unexpected.clone();

Expand Down
2 changes: 1 addition & 1 deletion packages/midnight-smoker/test/e2e/run-script.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {ExecResult} from '#schema/exec-result';
import path from 'node:path';
import snapshot from 'snap-shot-it';
import unexpected from 'unexpected';
import type {ExecResult} from '../../src/schema/exec-result';
import assertions from '../assertions';
import {execSmoker, fixupOutput} from './cli-helpers';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {ExecError} from '#error/exec-error';
import {type ExecaError} from 'execa';
import {pick} from 'lodash';
import unexpected from 'unexpected';
import {ExecError} from '../../../../src/error/exec-error';

const expect = unexpected.clone();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import {ExecError} from '#error/exec-error';
import {ExecErrorSchema, ExecResultSchema} from '#schema/exec-result';
import unexpected from 'unexpected';
import {ExecError} from '../../../../src/error/exec-error';
import {
ExecErrorSchema,
ExecResultSchema,
} from '../../../../src/schema/exec-result';

const expect = unexpected.clone();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import {DEFAULT_PKG_MANAGER_BIN, DEFAULT_PKG_MANAGER_VERSION} from '#constants';
import {ErrorCodes} from '#error/codes';
import type * as PMLoader from '#pkg-manager/pkg-manager-loader';
import {type PkgManagerDef} from '#schema/pkg-manager-def';
import {type WorkspaceInfo} from '#schema/workspaces';
import rewiremock from 'rewiremock/node';
import {createSandbox} from 'sinon';
import unexpected from 'unexpected';
import unexpectedSinon from 'unexpected-sinon';
import {
DEFAULT_PKG_MANAGER_BIN,
DEFAULT_PKG_MANAGER_VERSION,
} from '../../../../src/constants';
import {ErrorCodes} from '../../../../src/error';
import type * as PMLoader from '../../../../src/pkg-manager/pkg-manager-loader';
import {type PkgManagerDef} from '../../../../src/schema/pkg-manager-def';
import {type WorkspaceInfo} from '../../../../src/schema/workspaces';
import {
nullPkgManagerDef as _nullPkgManagerDef,
nullPkgManagerSpec,
Expand All @@ -32,7 +29,7 @@ describe('midnight-smoker', function () {
nullPkgManagerDef = {..._nullPkgManagerDef};

({loadPackageManagers} = rewiremock.proxy(
() => require('../../../../src/pkg-manager/pkg-manager-loader'),
() => require('#pkg-manager/pkg-manager-loader'),
mocks,
));
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import {DEFAULT_PKG_MANAGER_BIN, DEFAULT_PKG_MANAGER_VERSION} from '#constants';
import type * as PMO from '#pkg-manager/pkg-manager-spec';
import {type WorkspaceInfo} from '#schema/workspaces';
import {FileManager} from '#util/filemanager';
import {type Volume} from 'memfs/lib/volume';
import path from 'node:path';
import util from 'node:util';
import rewiremock from 'rewiremock/node';
import {createSandbox} from 'sinon';
import unexpected from 'unexpected';
import unexpectedSinon from 'unexpected-sinon';
import {
DEFAULT_PKG_MANAGER_BIN,
DEFAULT_PKG_MANAGER_VERSION,
} from '../../../../src/constants';
import type * as PMO from '../../../../src/pkg-manager/pkg-manager-spec';
import {type WorkspaceInfo} from '../../../../src/schema/workspaces';
import {FileManager} from '../../../../src/util';
import {nullPkgManagerDef} from '../../mocks';
import {createFsMocks} from '../../mocks/fs';

Expand Down Expand Up @@ -44,7 +41,7 @@ describe('midnight-smoker', function () {
.resolves(SYSTEM_PKG_MANAGER_VERSION);

({PkgManagerOracle} = rewiremock.proxy(
() => require('../../../../src/pkg-manager/pkg-manager-spec'),
() => require('#pkg-manager/pkg-manager-spec'),
{
'node:child_process': {
execFile: Object.assign(sandbox.stub(), {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import {DEFAULT_PKG_MANAGER_BIN, DEFAULT_PKG_MANAGER_VERSION} from '#constants';
import type * as PMS from '#pkg-manager/pkg-manager-spec';
import rewiremock from 'rewiremock/node';
import {SemVer} from 'semver';
import {createSandbox} from 'sinon';
import unexpected from 'unexpected';
import unexpectedSinon from 'unexpected-sinon';
import {
DEFAULT_PKG_MANAGER_BIN,
DEFAULT_PKG_MANAGER_VERSION,
} from '../../../../src/constants';
import type * as PMS from '../../../../src/pkg-manager/pkg-manager-spec';
import {createFsMocks} from '../../mocks/fs';

const expect = unexpected.clone().use(unexpectedSinon);
Expand All @@ -26,7 +23,7 @@ describe('midnight-smoker', function () {
sandbox = createSandbox();
const {mocks} = createFsMocks();
({PkgManagerSpec, PkgManagerOracle} = rewiremock.proxy(
() => require('../../../../src/pkg-manager/pkg-manager-spec'),
() => require('#pkg-manager/pkg-manager-spec'),
{
...mocks,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {normalizeVersion} from '#pkg-manager/pkg-manager-version';
import {npmVersionData} from '@midnight-smoker/plugin-default/data';
import {parse} from 'semver';
import unexpected from 'unexpected';
import {normalizeVersion} from '../../../../src/pkg-manager/pkg-manager-version';
const expect = unexpected.clone();
const npmDistTags = npmVersionData.tags;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {OK} from '#constants';
import {RuleContext} from '#rule/rule-context';
import {type StaticRuleContext} from '#schema/rule-static';
import {type SomeRuleDef} from '#schema/some-rule-def';
import {omit} from 'lodash';
import unexpected from 'unexpected';
import {fileURLToPath} from 'url';
import {RuleContext} from '../../../../src/rule/rule-context';
import {type StaticRuleContext} from '../../../../src/schema/rule-static';
import {type SomeRuleDef} from '../../../../src/schema/some-rule-def';

const expect = unexpected.clone();

Expand Down
15 changes: 6 additions & 9 deletions packages/midnight-smoker/test/unit/component/rule/issue.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import {RuleSeverities} from '#constants';
import {RuleError} from '#error/rule-error';
import {RuleIssue, type RuleIssueParams} from '#rule/rule-issue';
import {type CheckFailed} from '#schema/check-result';
import type {StaticRuleContext, StaticRuleDef} from '#schema/rule-static';
import {asResult} from '#util/util';
import {omit} from 'lodash';
import unexpected from 'unexpected';
import {RuleSeverities} from '../../../../src/constants';
import {RuleError} from '../../../../src/error/rule-error';
import {RuleIssue, type RuleIssueParams} from '../../../../src/rule/rule-issue';
import {type CheckFailed} from '../../../../src/schema/check-result';
import type {
StaticRuleContext,
StaticRuleDef,
} from '../../../../src/schema/rule-static';
import {asResult} from '../../../../src/util/util';

const expect = unexpected.clone();

Expand Down
10 changes: 5 additions & 5 deletions packages/midnight-smoker/test/unit/machine/actor-util.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {AssertionError} from 'node:assert';
import unexpected from 'unexpected';
import unexpectedSinon from 'unexpected-sinon';
import {ERROR, OK} from '../../../src/constants';
import {ERROR, OK} from '#constants';
import {
assertActorOutputNotOk,
assertActorOutputOk,
isActorOutputNotOk,
isActorOutputOk,
monkeypatchActorLogger,
} from '../../../src/machine/util';
} from '#machine/util';
import {AssertionError} from 'node:assert';
import unexpected from 'unexpected';
import unexpectedSinon from 'unexpected-sinon';
const expect = unexpected.clone().use(unexpectedSinon);

describe('midnight-smoker', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import {ERROR} from '#constants';
import {ErrorCodes} from '#error/codes';
import {LoadableComponents, LoaderMachine} from '#machine/loader';
import {type SmokerOptions} from '#options/options';
import {OptionParser} from '#options/parser';
import {type PluginMetadata} from '#plugin/plugin-metadata';
import {PluginRegistry} from '#plugin/plugin-registry';
import {type WorkspaceInfo} from '#schema/workspaces';
import {FileManager} from '#util/filemanager';
import {memfs} from 'memfs';
import {type Volume} from 'memfs/lib/volume';
import {createSandbox} from 'sinon';
import unexpected from 'unexpected';
import {ERROR} from '../../../src/constants';
import {LoadableComponents, LoaderMachine} from '../../../src/machine/loader';
import {OptionParser, type SmokerOptions} from '../../../src/options';
import {type PluginMetadata} from '../../../src/plugin';
import {PluginRegistry} from '../../../src/plugin/plugin-registry';
import {type WorkspaceInfo} from '../../../src/schema/workspaces';
import {FileManager} from '../../../src/util/filemanager';
import {nullPkgManagerDef, nullReporter, nullRule} from '../mocks/component';
import {createActorRunner} from './actor-helpers';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
import {ERROR, FAILED, OK, SKIPPED} from '#constants';
import {ErrorCodes} from '#error/codes';
import {ScriptFailedError} from '#error/script-failed-error';
import {type RuleInitPayload} from '#machine/loader';
import {
PkgManagerMachine,
type PkgManagerMachineInput,
} from '#machine/pkg-manager';
import {type SmokerOptions} from '#options/options';
import {OptionParser} from '#options/parser';
import {PkgManagerSpec} from '#pkg-manager/pkg-manager-spec';
import {type PluginMetadata} from '#plugin/plugin-metadata';
import {PluginRegistry} from '#plugin/plugin-registry';
import {type PkgManagerDef} from '#schema/pkg-manager-def';
import {type RunScriptManifest} from '#schema/run-script-manifest';
import {type RunScriptResultFailed} from '#schema/run-script-result';
import {type StaticPluginMetadata} from '#schema/static-plugin-metadata';
import {type WorkspaceInfo} from '#schema/workspaces';
import {FileManager} from '#util/filemanager';
import {serialize} from '#util/serialize';
import Debug from 'debug';
import {memfs} from 'memfs';
import {type Volume} from 'memfs/lib/volume';
import {createSandbox} from 'sinon';
import unexpected from 'unexpected';
import unexpectedSinon from 'unexpected-sinon';
import {createEmptyActor, type AnyActorRef} from 'xstate';
import {ERROR, FAILED, OK, SKIPPED} from '../../../../src/constants';
import {ErrorCodes, ScriptFailedError} from '../../../../src/error';
import {type RuleInitPayload} from '../../../../src/machine/loader/loader-machine-types';
import {
PkgManagerMachine,
type PkgManagerMachineInput,
} from '../../../../src/machine/pkg-manager';
import {OptionParser, type SmokerOptions} from '../../../../src/options';
import {
PkgManagerSpec,
type PkgManagerDef,
type RunScriptManifest,
type RunScriptResultFailed,
type WorkspaceInfo,
} from '../../../../src/pkg-manager';
import {type PluginMetadata} from '../../../../src/plugin';
import {PluginRegistry} from '../../../../src/plugin/plugin-registry';
import {FileManager} from '../../../../src/util/filemanager';
import {serialize} from '../../../../src/util/serialize';
import {nullExecutor, nullPkgManagerDef, nullRule} from '../../mocks/component';
import {createActorRunner} from '../actor-helpers';
const debug = Debug('midnight-smoker:test:pkg-manager-machine');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
import {OK, RuleSeverities} from '#constants';
import {ErrorCodes} from '#error/codes';
import {
RuleMachine,
type PkgManagerMachineCheckErrorEvent,
type PkgManagerMachineCheckResultEvent,
type RuleMachineInput,
} from '#machine/pkg-manager';
import {PluginRegistry} from '#plugin/plugin-registry';
import {type LintManifest} from '#schema/lint-manifest';
import {type SomeRuleConfig} from '#schema/rule-options';
import {type StaticRuleContext} from '#schema/rule-static';
import {FileManager} from '#util/filemanager';
import Debug from 'debug';
import {memfs} from 'memfs';
import {type Volume} from 'memfs/lib/volume';
Expand All @@ -16,16 +24,6 @@ import {
type ActorRef,
type Snapshot,
} from 'xstate';
import {
type PkgManagerMachineCheckErrorEvent,
type PkgManagerMachineCheckResultEvent,
} from '../../../../src/machine/pkg-manager/pkg-manager-machine-events';
import {
RuleMachine,
type RuleMachineInput,
} from '../../../../src/machine/pkg-manager/rule-machine';
import {PluginRegistry} from '../../../../src/plugin/plugin-registry';
import {FileManager} from '../../../../src/util/filemanager';
import {nullRule} from '../../mocks/component';
import {createActorRunner} from '../actor-helpers';

Expand Down
Loading

0 comments on commit 2b705e3

Please sign in to comment.