Skip to content

test: relocate remaining Apple-engine unit tests to apple/core (#980) #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thymikee wants to merge 1 commit into from
Closed

test: relocate remaining Apple-engine unit tests to apple/core (#980) #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...s/ios/__tests__/recording-scripts.test.ts → .../core/__tests__/recording-scripts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import { test } from 'vitest';
import assert from 'node:assert/strict';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { runCmd } from '../../../utils/exec.ts';
import { getRecordingOverlaySupportWarning } from '../../../recording/overlay.ts';
import { runCmd } from '../../../../utils/exec.ts';
import { getRecordingOverlaySupportWarning } from '../../../../recording/overlay.ts';

const __dirname = path.dirname(fileURLToPath(import.meta.url));
const recordingScriptsDir = path.resolve(
__dirname,
'../../../../ios-runner/AgentDeviceRunner/RecordingScripts',
'../../../../../ios-runner/AgentDeviceRunner/RecordingScripts',
);
const recordingTestSupportDir = path.resolve(__dirname, '../../../../test/integration/support');
const recordingTestSupportDir = path.resolve(__dirname, '../../../../../test/integration/support');
const SWIFT_TYPECHECK_TIMEOUT_MS = 60_000;

async function assertSwiftScriptTypechecks(scriptPath: string): Promise<void> {
Expand Down
39 changes: 20 additions & 19 deletions ...forms/ios/__tests__/runner-client.test.ts → ...pple/core/__tests__/runner-client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,38 @@ const { mockRunCmdStreaming, mockRepairMacOsRunnerProductsIfNeeded } = vi.hoiste
mockRepairMacOsRunnerProductsIfNeeded: vi.fn(),
}));

vi.mock('../../../utils/exec.ts', async () => {
const actual =
await vi.importActual<typeof import('../../../utils/exec.ts')>('../../../utils/exec.ts');
vi.mock('../../../../utils/exec.ts', async () => {
const actual = await vi.importActual<typeof import('../../../../utils/exec.ts')>(
'../../../../utils/exec.ts',
);
return {
...actual,
runCmdStreaming: mockRunCmdStreaming,
};
});

vi.mock('../../apple/core/runner/runner-macos-products.ts', async () => {
const actual = await vi.importActual<
typeof import('../../apple/core/runner/runner-macos-products.ts')
>('../../apple/core/runner/runner-macos-products.ts');
vi.mock('../runner/runner-macos-products.ts', async () => {
const actual = await vi.importActual<typeof import('../runner/runner-macos-products.ts')>(
'../runner/runner-macos-products.ts',
);
return {
...actual,
repairMacOsRunnerProductsIfNeeded: mockRepairMacOsRunnerProductsIfNeeded,
};
});

import type { DeviceInfo } from '../../../kernel/device.ts';
import type { DeviceInfo } from '../../../../kernel/device.ts';
import {
type RequestProgressEvent,
withRequestProgressSink,
} from '../../../daemon/request-progress.ts';
import { flushDiagnosticsToSessionFile, withDiagnosticsScope } from '../../../utils/diagnostics.ts';
import { AppError } from '../../../kernel/errors.ts';
import { isReadOnlyRunnerCommand } from '../../apple/core/runner/runner-command-traits.ts';
} from '../../../../daemon/request-progress.ts';
import {
withRunnerCommandId,
type RunnerCommand,
} from '../../apple/core/runner/runner-contract.ts';
flushDiagnosticsToSessionFile,
withDiagnosticsScope,
} from '../../../../utils/diagnostics.ts';
import { AppError } from '../../../../kernel/errors.ts';
import { isReadOnlyRunnerCommand } from '../runner/runner-command-traits.ts';
import { withRunnerCommandId, type RunnerCommand } from '../runner/runner-contract.ts';
import {
assertSafeDerivedCleanup,
isRetryableRunnerError,
Expand All @@ -52,7 +53,7 @@ import {
resolveRunnerMaxConcurrentDestinationsFlag,
resolveRunnerSigningBuildSettings,
shouldRetryRunnerConnectError,
} from '../../apple/core/runner/runner-client.ts';
} from '../runner/runner-client.ts';
import {
acquireRunnerXctestrunCacheLock,
ensureXctestrunArtifact,
Expand All @@ -66,8 +67,8 @@ import {
shouldDeleteRunnerDerivedRootEntry,
writeRunnerCacheMetadata,
xctestrunReferencesProjectRoot,
} from '../../apple/core/runner/runner-xctestrun.ts';
import { parseRunnerResponse } from '../../apple/core/runner/runner-session.ts';
} from '../runner/runner-xctestrun.ts';
import { parseRunnerResponse } from '../runner/runner-session.ts';

const iosSimulator: DeviceInfo = {
platform: 'ios',
Expand Down Expand Up @@ -180,7 +181,7 @@ const runnerProtocolCommandFixtures: Record<RunnerCommand['command'], RunnerComm
shutdown: { command: 'shutdown' },
};

const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../');
const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../../');

async function makeTmpDir(): Promise<string> {
const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'agent-device-xctestrun-'));
Expand Down
Loading