apify-test-tools 0.10.1-beta.2 → 0.10.1-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/actions/checkout-restore-dependencies/action.yaml +4 -3
- package/.github/workflows/public_platform-tests-claude-investigate-and-fix.yaml +7 -2
- package/.github/workflows/public_platform-tests.yaml +0 -1
- package/.github/workflows-package-version +1 -1
- package/CHANGELOG.md +6 -0
- package/CONTRIBUTING.md +13 -3
- package/README.md +2 -2
- package/bin/build-from-local.ts +8 -7
- package/bin/build.ts +22 -21
- package/bin/diff-changes.ts +11 -10
- package/bin/diff-json-schema.ts +14 -12
- package/bin/git.ts +89 -47
- package/bin/logger.ts +23 -0
- package/bin/main.ts +44 -38
- package/bin/output.ts +6 -0
- package/bin/slack.ts +8 -7
- package/bin/test-report.ts +22 -21
- package/bin/types.ts +0 -1
- package/bin/utils/config/actor-json.ts +84 -0
- package/bin/utils/config/load-config.ts +46 -46
- package/bin/utils/config/parser.ts +33 -28
- package/bin/utils/config/structures/base.ts +7 -0
- package/bin/utils/json-file.ts +11 -14
- package/bin/utils/path/repo-relative.ts +156 -0
- package/bin/utils/path/schema.ts +18 -0
- package/bin/utils.ts +63 -44
- package/dist/bin/build-from-local.d.ts +1 -1
- package/dist/bin/build-from-local.d.ts.map +1 -1
- package/dist/bin/build-from-local.js +8 -7
- package/dist/bin/build-from-local.js.map +1 -1
- package/dist/bin/build.d.ts.map +1 -1
- package/dist/bin/build.js +22 -21
- package/dist/bin/build.js.map +1 -1
- package/dist/bin/diff-changes.d.ts +1 -1
- package/dist/bin/diff-changes.d.ts.map +1 -1
- package/dist/bin/diff-changes.js +9 -8
- package/dist/bin/diff-changes.js.map +1 -1
- package/dist/bin/diff-json-schema.d.ts +1 -1
- package/dist/bin/diff-json-schema.d.ts.map +1 -1
- package/dist/bin/diff-json-schema.js +13 -12
- package/dist/bin/diff-json-schema.js.map +1 -1
- package/dist/bin/git.d.ts +10 -10
- package/dist/bin/git.d.ts.map +1 -1
- package/dist/bin/git.js +78 -37
- package/dist/bin/git.js.map +1 -1
- package/dist/bin/logger.d.ts +11 -0
- package/dist/bin/logger.d.ts.map +1 -0
- package/dist/bin/logger.js +20 -0
- package/dist/bin/logger.js.map +1 -0
- package/dist/bin/main.d.ts +1 -1
- package/dist/bin/main.js +44 -38
- package/dist/bin/main.js.map +1 -1
- package/dist/bin/output.d.ts +3 -0
- package/dist/bin/output.d.ts.map +1 -0
- package/dist/bin/output.js +6 -0
- package/dist/bin/output.js.map +1 -0
- package/dist/bin/slack.d.ts.map +1 -1
- package/dist/bin/slack.js +8 -7
- package/dist/bin/slack.js.map +1 -1
- package/dist/bin/test-report.d.ts.map +1 -1
- package/dist/bin/test-report.js +22 -21
- package/dist/bin/test-report.js.map +1 -1
- package/dist/bin/types.d.ts +0 -1
- package/dist/bin/types.d.ts.map +1 -1
- package/dist/bin/utils/config/actor-json.d.ts +14 -0
- package/dist/bin/utils/config/actor-json.d.ts.map +1 -0
- package/dist/bin/utils/config/actor-json.js +60 -0
- package/dist/bin/utils/config/actor-json.js.map +1 -0
- package/dist/bin/utils/config/load-config.d.ts +12 -2
- package/dist/bin/utils/config/load-config.d.ts.map +1 -1
- package/dist/bin/utils/config/load-config.js +32 -31
- package/dist/bin/utils/config/load-config.js.map +1 -1
- package/dist/bin/utils/config/parser.d.ts +4 -12
- package/dist/bin/utils/config/parser.d.ts.map +1 -1
- package/dist/bin/utils/config/parser.js +24 -23
- package/dist/bin/utils/config/parser.js.map +1 -1
- package/dist/bin/utils/config/structures/base.d.ts +5 -0
- package/dist/bin/utils/config/structures/base.d.ts.map +1 -1
- package/dist/bin/utils/config/structures/base.js.map +1 -1
- package/dist/bin/utils/json-file.d.ts +3 -2
- package/dist/bin/utils/json-file.d.ts.map +1 -1
- package/dist/bin/utils/json-file.js +8 -13
- package/dist/bin/utils/json-file.js.map +1 -1
- package/dist/bin/utils/path/repo-relative.d.ts +35 -0
- package/dist/bin/utils/path/repo-relative.d.ts.map +1 -0
- package/dist/bin/utils/path/repo-relative.js +137 -0
- package/dist/bin/utils/path/repo-relative.js.map +1 -0
- package/dist/bin/utils/path/schema.d.ts +7 -0
- package/dist/bin/utils/path/schema.d.ts.map +1 -0
- package/dist/bin/utils/path/schema.js +16 -0
- package/dist/bin/utils/path/schema.js.map +1 -0
- package/dist/bin/utils.d.ts +14 -6
- package/dist/bin/utils.d.ts.map +1 -1
- package/dist/bin/utils.js +52 -36
- package/dist/bin/utils.js.map +1 -1
- package/dist/test/unit/bin/build-from-local.test.js +4 -40
- package/dist/test/unit/bin/build-from-local.test.js.map +1 -1
- package/dist/test/unit/bin/diff-changes.test.js +97 -96
- package/dist/test/unit/bin/diff-changes.test.js.map +1 -1
- package/dist/test/unit/bin/diff.test.js +52 -48
- package/dist/test/unit/bin/diff.test.js.map +1 -1
- package/dist/test/unit/bin/git-command.test.d.ts +2 -0
- package/dist/test/unit/bin/git-command.test.d.ts.map +1 -0
- package/dist/test/unit/bin/git-command.test.js +54 -0
- package/dist/test/unit/bin/git-command.test.js.map +1 -0
- package/dist/test/unit/bin/git.test.js +211 -94
- package/dist/test/unit/bin/git.test.js.map +1 -1
- package/dist/test/unit/bin/logger.test.d.ts +2 -0
- package/dist/test/unit/bin/logger.test.d.ts.map +1 -0
- package/dist/test/unit/bin/logger.test.js +44 -0
- package/dist/test/unit/bin/logger.test.js.map +1 -0
- package/dist/test/unit/bin/logging.test.d.ts +2 -0
- package/dist/test/unit/bin/logging.test.d.ts.map +1 -0
- package/dist/test/unit/bin/logging.test.js +43 -0
- package/dist/test/unit/bin/logging.test.js.map +1 -0
- package/dist/test/unit/bin/utils/config/load-config.test.js +47 -25
- package/dist/test/unit/bin/utils/config/load-config.test.js.map +1 -1
- package/dist/test/unit/bin/utils/config/parser.test.js +64 -19
- package/dist/test/unit/bin/utils/config/parser.test.js.map +1 -1
- package/dist/test/unit/bin/utils/files.test.js +16 -27
- package/dist/test/unit/bin/utils/files.test.js.map +1 -1
- package/dist/test/unit/bin/utils/path/repo-relative.test.d.ts +2 -0
- package/dist/test/unit/bin/utils/path/repo-relative.test.d.ts.map +1 -0
- package/dist/test/unit/bin/utils/path/repo-relative.test.js +196 -0
- package/dist/test/unit/bin/utils/path/repo-relative.test.js.map +1 -0
- package/dist/test/unit/bin/utils/path/schema.test.d.ts +2 -0
- package/dist/test/unit/bin/utils/path/schema.test.d.ts.map +1 -0
- package/dist/test/unit/bin/utils/path/schema.test.js +52 -0
- package/dist/test/unit/bin/utils/path/schema.test.js.map +1 -0
- package/dist/test/unit/should-built-and-test.test.js +40 -38
- package/dist/test/unit/should-built-and-test.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/eslint.config.mjs +9 -1
- package/package.json +5 -5
- package/test/unit/bin/build-from-local.test.ts +4 -54
- package/test/unit/bin/diff-changes.test.ts +97 -96
- package/test/unit/bin/diff.test.ts +53 -48
- package/test/unit/bin/git-command.test.ts +71 -0
- package/test/unit/bin/git.test.ts +246 -91
- package/test/unit/bin/logger.test.ts +55 -0
- package/test/unit/bin/logging.test.ts +52 -0
- package/test/unit/bin/utils/config/load-config.test.ts +63 -26
- package/test/unit/bin/utils/config/parser.test.ts +81 -27
- package/test/unit/bin/utils/files.test.ts +19 -33
- package/test/unit/bin/utils/path/repo-relative.test.ts +250 -0
- package/test/unit/bin/utils/path/schema.test.ts +65 -0
- package/test/unit/should-built-and-test.test.ts +40 -38
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { execFileSync, spawnSync } from 'node:child_process';
|
|
2
|
+
import { chmod, mkdtemp, rm, writeFile } from 'node:fs/promises';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import process from 'node:process';
|
|
6
|
+
import { fileURLToPath } from 'node:url';
|
|
7
|
+
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
|
8
|
+
const projectRoot = fileURLToPath(new URL('../../../', import.meta.url));
|
|
9
|
+
const compilerPath = fileURLToPath(new URL('../../../node_modules/typescript/bin/tsc', import.meta.url));
|
|
10
|
+
let cliPath;
|
|
11
|
+
let buildDir;
|
|
12
|
+
let gitStubDir;
|
|
13
|
+
const sha = '1'.repeat(40);
|
|
14
|
+
describe('CLI logging', () => {
|
|
15
|
+
beforeAll(async () => {
|
|
16
|
+
buildDir = await mkdtemp(path.join(projectRoot, '.cli-test-'));
|
|
17
|
+
execFileSync(process.execPath, [compilerPath, '--outDir', buildDir], { cwd: projectRoot });
|
|
18
|
+
cliPath = path.join(buildDir, 'bin/main.js');
|
|
19
|
+
await chmod(cliPath, 0o755);
|
|
20
|
+
gitStubDir = await mkdtemp(path.join(os.tmpdir(), 'apify-cli-logging-'));
|
|
21
|
+
const gitStub = path.join(gitStubDir, 'git');
|
|
22
|
+
await writeFile(gitStub, `#!/bin/sh\nprintf '%s' '${sha}»¦«Test<test@example.com>»¦«Tue, 06 Oct 2026 00:00:00 +0000»¦«feature'\n`);
|
|
23
|
+
await chmod(gitStub, 0o755);
|
|
24
|
+
});
|
|
25
|
+
afterAll(async () => {
|
|
26
|
+
if (buildDir)
|
|
27
|
+
await rm(buildDir, { recursive: true, force: true });
|
|
28
|
+
if (gitStubDir)
|
|
29
|
+
await rm(gitStubDir, { recursive: true, force: true });
|
|
30
|
+
});
|
|
31
|
+
it.each(['info', 'silent'])('keeps JSON results intact with --log-level %s', (level) => {
|
|
32
|
+
const result = spawnSync(cliPath, ['get-commits', '--source-branch', 'feature', '--target-branch', 'base', '--log-level', level], {
|
|
33
|
+
encoding: 'utf8',
|
|
34
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
35
|
+
env: { ...process.env, PATH: `${gitStubDir}${path.delimiter}${process.env.PATH ?? ''}` },
|
|
36
|
+
});
|
|
37
|
+
expect(result.status, result.stderr).toBe(0);
|
|
38
|
+
expect(result.stderr).toEqual(level === 'silent' ? '' : expect.stringContaining('Commits being returned:'));
|
|
39
|
+
expect(JSON.parse(result.stdout)).toMatchObject([{ sha, date: expect.any(String), message: 'feature' }]);
|
|
40
|
+
expect(result.stdout.endsWith('\n')).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
//# sourceMappingURL=logging.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logging.test.js","sourceRoot":"","sources":["../../../../test/unit/bin/logging.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import os from 'node:os';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
5
5
|
import { CONFIG_FILE_NAME, loadActorConfig, readConfigFile } from '../../../../../bin/utils/config/load-config.js';
|
|
6
|
+
import { ExistingDir, ExistingFile, RelativeDir, RelativeFile } from '../../../../../bin/utils/path/repo-relative.js';
|
|
6
7
|
let repoDir;
|
|
7
8
|
let originalCwd;
|
|
8
9
|
beforeEach(async () => {
|
|
@@ -10,6 +11,7 @@ beforeEach(async () => {
|
|
|
10
11
|
// `realpath` because macOS hands out a symlinked temp dir, while `process.cwd()` reports the target.
|
|
11
12
|
repoDir = await fs.realpath(await fs.mkdtemp(path.join(os.tmpdir(), 'apify-test-tools-config-')));
|
|
12
13
|
process.chdir(repoDir);
|
|
14
|
+
await fs.mkdir('actors/shopify', { recursive: true });
|
|
13
15
|
});
|
|
14
16
|
afterEach(async () => {
|
|
15
17
|
process.chdir(originalCwd);
|
|
@@ -25,56 +27,76 @@ const writeFiles = async (files) => Promise.all(Object.entries(files).map(async
|
|
|
25
27
|
}));
|
|
26
28
|
describe('loadActorConfig', () => {
|
|
27
29
|
const entry = (fields = {}) => ({
|
|
28
|
-
folder: 'actors/shopify',
|
|
29
|
-
actorFullName: 'myteam/shopify',
|
|
30
|
-
tokenEnvVar: 'APIFY_TOKEN',
|
|
31
|
-
overrideActorContext:
|
|
32
|
-
...fields,
|
|
30
|
+
folder: new ExistingDir(fields.folder ?? 'actors/shopify'),
|
|
31
|
+
actorFullName: fields.actorFullName ?? 'myteam/shopify',
|
|
32
|
+
tokenEnvVar: fields.tokenEnvVar ?? 'APIFY_TOKEN',
|
|
33
|
+
overrideActorContext: fields.overrideActorContext?.map((contextPath) => new RelativeDir(contextPath)),
|
|
33
34
|
});
|
|
34
35
|
const writeActorJson = async (fields = {}) => writeFiles({ 'actors/shopify/.actor/actor.json': actorJson(fields) });
|
|
35
36
|
it('resolves data coming from actor.json', async () => {
|
|
36
37
|
await writeActorJson({ dockerContextDir: '..' });
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
const loaded = loadActorConfig(entry());
|
|
39
|
+
expect(loaded.actorFullName).toBe('myteam/shopify');
|
|
40
|
+
expect(loaded.folder).toBeInstanceOf(ExistingDir);
|
|
41
|
+
expect(loaded.folder.path).toBe('actors/shopify');
|
|
42
|
+
expect(loaded.actorJson.file).toBeInstanceOf(ExistingFile);
|
|
43
|
+
expect(loaded.actorJson.file.path).toBe('actors/shopify/.actor/actor.json');
|
|
44
|
+
expect(loaded.dockerContextDir).toBeInstanceOf(RelativeDir);
|
|
45
|
+
expect(loaded.dockerContextDir.path).toBe('actors/shopify');
|
|
46
|
+
expect(loaded.contextPaths.map((contextPath) => contextPath.path)).toEqual(['actors/shopify']);
|
|
44
47
|
});
|
|
45
48
|
it('defaults dockerContextDir to the actor folder when actor.json does not set it', async () => {
|
|
46
49
|
await writeActorJson();
|
|
47
|
-
expect(loadActorConfig(entry()).dockerContextDir).toBe('actors/shopify');
|
|
50
|
+
expect(loadActorConfig(entry()).dockerContextDir.path).toBe('actors/shopify');
|
|
51
|
+
});
|
|
52
|
+
it('resolves path fields from actor.json while allowing inline schemas', async () => {
|
|
53
|
+
await writeActorJson({
|
|
54
|
+
readme: '../README.md',
|
|
55
|
+
changelog: '../../CHANGELOG.md',
|
|
56
|
+
dockerfile: '../Dockerfile',
|
|
57
|
+
input: '../INPUT_SCHEMA.json',
|
|
58
|
+
output: { type: 'object' },
|
|
59
|
+
webServerSchema: './openapi.json',
|
|
60
|
+
});
|
|
61
|
+
const { actorJson: actorJsonPaths } = loadActorConfig(entry());
|
|
62
|
+
expect(actorJsonPaths.readme).toBeInstanceOf(RelativeFile);
|
|
63
|
+
expect(actorJsonPaths.readme?.path).toBe('actors/shopify/README.md');
|
|
64
|
+
expect(actorJsonPaths.changelog?.path).toBe('actors/CHANGELOG.md');
|
|
65
|
+
expect(actorJsonPaths.dockerfile?.path).toBe('actors/shopify/Dockerfile');
|
|
66
|
+
expect(actorJsonPaths.inputSchema?.path).toBe('actors/shopify/INPUT_SCHEMA.json');
|
|
67
|
+
expect(actorJsonPaths.outputSchema).toBeUndefined();
|
|
68
|
+
expect(actorJsonPaths.webServerSchema?.path).toBe('actors/shopify/.actor/openapi.json');
|
|
69
|
+
});
|
|
70
|
+
it('rejects malformed actor.json path fields', async () => {
|
|
71
|
+
await writeActorJson({ dockerContextDir: 123 });
|
|
72
|
+
expect(() => loadActorConfig(entry())).toThrow(/dockerContextDir/);
|
|
73
|
+
await writeActorJson({ readme: '/outside.md' });
|
|
74
|
+
expect(() => loadActorConfig(entry())).toThrow(/Invalid "readme"/);
|
|
75
|
+
await writeActorJson({ inputSchema: '/outside.json' });
|
|
76
|
+
expect(() => loadActorConfig(entry())).toThrow(/Invalid "inputSchema"/);
|
|
48
77
|
});
|
|
49
78
|
it('resolves dockerContextDir relative to the .actor/ folder, not the actor folder', async () => {
|
|
50
79
|
await writeActorJson({ dockerContextDir: '../../..' });
|
|
51
|
-
expect(loadActorConfig(entry()).dockerContextDir).toBe('');
|
|
80
|
+
expect(loadActorConfig(entry()).dockerContextDir.path).toBe('.');
|
|
52
81
|
});
|
|
53
82
|
it('throws when dockerContextDir resolves outside the repository root', async () => {
|
|
54
83
|
await writeActorJson({ dockerContextDir: '../../../..' });
|
|
55
|
-
expect(() => loadActorConfig(entry())).toThrow(/
|
|
84
|
+
expect(() => loadActorConfig(entry())).toThrow(/escapes the repo root/);
|
|
56
85
|
});
|
|
57
86
|
it('throws when actor.json is missing', () => {
|
|
58
87
|
expect(() => loadActorConfig(entry())).toThrow('Cannot read');
|
|
59
88
|
});
|
|
60
89
|
it('resolves contextPaths from overrideActorContext', async () => {
|
|
61
90
|
await writeActorJson({ dockerContextDir: '../../..' });
|
|
62
|
-
expect(loadActorConfig(entry({ overrideActorContext: ['actors/shopify', 'packages'] })).contextPaths).toEqual([
|
|
63
|
-
'actors/shopify',
|
|
64
|
-
'packages',
|
|
65
|
-
]);
|
|
91
|
+
expect(loadActorConfig(entry({ overrideActorContext: ['actors/shopify', 'packages'] })).contextPaths.map((contextPath) => contextPath.path)).toEqual(['actors/shopify', 'packages']);
|
|
66
92
|
});
|
|
67
93
|
it('adds the actor own folder automatically when overrideActorContext does not cover it', async () => {
|
|
68
94
|
await writeActorJson();
|
|
69
|
-
expect(loadActorConfig(entry({ overrideActorContext: ['code', 'shared'] })).contextPaths).toEqual([
|
|
70
|
-
'code',
|
|
71
|
-
'shared',
|
|
72
|
-
'actors/shopify',
|
|
73
|
-
]);
|
|
95
|
+
expect(loadActorConfig(entry({ overrideActorContext: ['code', 'shared'] })).contextPaths.map((contextPath) => contextPath.path)).toEqual(['code', 'shared', 'actors/shopify']);
|
|
74
96
|
});
|
|
75
97
|
it('allows overrideActorContext with disjoint sibling paths that all reach the actor folder via one entry', async () => {
|
|
76
98
|
await writeActorJson();
|
|
77
|
-
expect(loadActorConfig(entry({ overrideActorContext: ['actors/shopify', 'code', 'shared'] })).contextPaths).toEqual(['actors/shopify', 'code', 'shared']);
|
|
99
|
+
expect(loadActorConfig(entry({ overrideActorContext: ['actors/shopify', 'code', 'shared'] })).contextPaths.map((contextPath) => contextPath.path)).toEqual(['actors/shopify', 'code', 'shared']);
|
|
78
100
|
});
|
|
79
101
|
it('throws when overrideActorContext entries overlap (one is a prefix of another)', async () => {
|
|
80
102
|
await writeActorJson();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-config.test.js","sourceRoot":"","sources":["../../../../../../test/unit/bin/utils/config/load-config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAErE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;
|
|
1
|
+
{"version":3,"file":"load-config.test.js","sourceRoot":"","sources":["../../../../../../test/unit/bin/utils/config/load-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,36 @@
|
|
|
1
|
-
import
|
|
1
|
+
import fs from 'node:fs/promises';
|
|
2
|
+
import os from 'node:os';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
|
2
5
|
import { _privates, parseConfigFile } from '../../../../../bin/utils/config/parser.js';
|
|
3
6
|
import { CONFIG_FILE_STRATEGY } from '../../../../../bin/utils/config/structures/base.js';
|
|
4
7
|
import { GROUPED_PARSER } from '../../../../../bin/utils/config/structures/grouped.js';
|
|
5
8
|
import { LEGACY_PARSER } from '../../../../../bin/utils/config/structures/legacy.js';
|
|
9
|
+
import { ExistingDir, RelativeDir } from '../../../../../bin/utils/path/repo-relative.js';
|
|
6
10
|
const { selectStrategy, verifyConfiguration } = _privates;
|
|
11
|
+
let repoDir;
|
|
12
|
+
const originalCwd = process.cwd();
|
|
13
|
+
beforeAll(async () => {
|
|
14
|
+
repoDir = await fs.realpath(await fs.mkdtemp(path.join(os.tmpdir(), 'apify-test-tools-parser-')));
|
|
15
|
+
for (const folder of [
|
|
16
|
+
'actors/shopify',
|
|
17
|
+
'actors/a',
|
|
18
|
+
'actors/b',
|
|
19
|
+
'actors/c',
|
|
20
|
+
'actors/d',
|
|
21
|
+
'bin',
|
|
22
|
+
'test',
|
|
23
|
+
'collide/collide',
|
|
24
|
+
]) {
|
|
25
|
+
await fs.mkdir(path.join(repoDir, folder), { recursive: true });
|
|
26
|
+
}
|
|
27
|
+
await fs.writeFile(path.join(repoDir, 'package.json'), '{}');
|
|
28
|
+
process.chdir(repoDir);
|
|
29
|
+
});
|
|
30
|
+
afterAll(async () => {
|
|
31
|
+
process.chdir(originalCwd);
|
|
32
|
+
await fs.rm(repoDir, { recursive: true, force: true });
|
|
33
|
+
});
|
|
7
34
|
const actor = (fields = {}) => ({
|
|
8
35
|
folder: 'actors/shopify',
|
|
9
36
|
actorFullName: 'myteam/shopify',
|
|
@@ -26,7 +53,7 @@ describe('selectStrategy', () => {
|
|
|
26
53
|
});
|
|
27
54
|
});
|
|
28
55
|
describe('verifyConfiguration', () => {
|
|
29
|
-
it('resolves the repo root
|
|
56
|
+
it('resolves the repo root and gets rid of trailing slashes', () => {
|
|
30
57
|
const result = verifyConfiguration([
|
|
31
58
|
{ folder: '.', actorFullName: 'myteam/root', tokenEnvVar: 'APIFY_TOKEN', overrideActorContext: undefined },
|
|
32
59
|
{
|
|
@@ -36,15 +63,11 @@ describe('verifyConfiguration', () => {
|
|
|
36
63
|
overrideActorContext: ['packages/'],
|
|
37
64
|
},
|
|
38
65
|
]);
|
|
39
|
-
expect(result).
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
tokenEnvVar: 'APIFY_TOKEN',
|
|
45
|
-
overrideActorContext: ['packages'],
|
|
46
|
-
},
|
|
47
|
-
]);
|
|
66
|
+
expect(result[0].folder).toBeInstanceOf(ExistingDir);
|
|
67
|
+
expect(result[0].folder.path).toBe('.');
|
|
68
|
+
expect(result[1].folder.path).toBe('actors/shopify');
|
|
69
|
+
expect(result[1].overrideActorContext?.[0]).toBeInstanceOf(RelativeDir);
|
|
70
|
+
expect(result[1].overrideActorContext?.[0].path).toBe('packages');
|
|
48
71
|
});
|
|
49
72
|
it.each([
|
|
50
73
|
['"." and ""', '.', ''],
|
|
@@ -99,13 +122,23 @@ describe('verifyConfiguration', () => {
|
|
|
99
122
|
});
|
|
100
123
|
});
|
|
101
124
|
describe('parseConfigFile', () => {
|
|
102
|
-
it('validates and normalizes
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
125
|
+
it('validates and normalizes paths after resolving the config', () => {
|
|
126
|
+
const [parsed] = parseConfigFile({ actors: [actor({ folder: './bin/', overrideActorContext: ['test/'] })] });
|
|
127
|
+
expect(parsed.folder).toBeInstanceOf(ExistingDir);
|
|
128
|
+
expect(parsed.folder.path).toBe('bin');
|
|
129
|
+
expect(parsed.overrideActorContext?.[0]).toBeInstanceOf(RelativeDir);
|
|
130
|
+
expect(parsed.overrideActorContext?.[0].path).toBe('test');
|
|
131
|
+
});
|
|
132
|
+
it('accepts the repo root as an existing directory', () => {
|
|
133
|
+
expect(parseConfigFile({ actors: [actor({ folder: '' })] })[0].folder.path).toBe('.');
|
|
134
|
+
});
|
|
135
|
+
it('reports invalid paths at their config fields', () => {
|
|
136
|
+
expect(() => parseConfigFile({ actors: [actor({ folder: 'missing-actor-dir' })] })).toThrow(/\[0\]\.folder/);
|
|
137
|
+
expect(() => parseConfigFile({ actors: [actor({ folder: 'package.json' })] })).toThrow(/to be a directory/);
|
|
138
|
+
expect(() => parseConfigFile({ actors: [actor({ folder: 'bin', overrideActorContext: ['../outside'] })] })).toThrow(/\[0\]\.overrideActorContext\[0\]/);
|
|
106
139
|
});
|
|
107
140
|
it('parses a grouped config file, which needs mode to be stripped', () => {
|
|
108
|
-
|
|
141
|
+
const parsed = parseConfigFile({
|
|
109
142
|
mode: CONFIG_FILE_STRATEGY.GROUPED,
|
|
110
143
|
groups: {
|
|
111
144
|
myteam: {
|
|
@@ -113,9 +146,13 @@ describe('parseConfigFile', () => {
|
|
|
113
146
|
tokenEnvVar: 'APIFY_TOKEN',
|
|
114
147
|
},
|
|
115
148
|
},
|
|
116
|
-
})
|
|
117
|
-
|
|
118
|
-
]);
|
|
149
|
+
});
|
|
150
|
+
expect(parsed).toHaveLength(1);
|
|
151
|
+
expect(parsed[0].folder).toBeInstanceOf(ExistingDir);
|
|
152
|
+
expect(parsed[0].folder.path).toBe('actors/shopify');
|
|
153
|
+
expect(parsed[0].actorFullName).toBe('myteam/shopify');
|
|
154
|
+
expect(parsed[0].tokenEnvVar).toBe('APIFY_TOKEN');
|
|
155
|
+
expect(parsed[0].overrideActorContext).toBeUndefined();
|
|
119
156
|
});
|
|
120
157
|
it('surfaces cross-entry violations from verifyConfiguration', () => {
|
|
121
158
|
expect(() => parseConfigFile({
|
|
@@ -125,5 +162,13 @@ describe('parseConfigFile', () => {
|
|
|
125
162
|
],
|
|
126
163
|
})).toThrow(/Duplicate folder/);
|
|
127
164
|
});
|
|
165
|
+
it('rejects folders that collide after resolving dot segments', () => {
|
|
166
|
+
expect(() => parseConfigFile({
|
|
167
|
+
actors: [
|
|
168
|
+
actor({ actorFullName: 'myteam/actor-a', folder: 'bin/../test' }),
|
|
169
|
+
actor({ actorFullName: 'myteam/actor-b', folder: 'test' }),
|
|
170
|
+
],
|
|
171
|
+
})).toThrow('Duplicate folder "test"');
|
|
172
|
+
});
|
|
128
173
|
});
|
|
129
174
|
//# sourceMappingURL=parser.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.test.js","sourceRoot":"","sources":["../../../../../../test/unit/bin/utils/config/parser.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.test.js","sourceRoot":"","sources":["../../../../../../test/unit/bin/utils/config/parser.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
|
-
import path from 'node:path';
|
|
3
2
|
import { fileURLToPath } from 'node:url';
|
|
4
|
-
import { afterEach, describe, expect, it } from 'vitest';
|
|
3
|
+
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
5
4
|
import { safeReadJsonObjectFile } from '../../../../bin/utils/json-file.js';
|
|
6
|
-
|
|
7
|
-
//
|
|
8
|
-
//
|
|
5
|
+
import { ExistingFile } from '../../../../bin/utils/path/repo-relative.js';
|
|
6
|
+
// These tests read real fixture files rather than mocking `node:fs`. Existence and file-kind checks
|
|
7
|
+
// happen when constructing ExistingFile; this reader tests JSON parsing and read failures after that.
|
|
9
8
|
const FIXTURE_DIR = fileURLToPath(new URL('../../../fixtures/bin/utils/files/', import.meta.url));
|
|
10
|
-
|
|
9
|
+
let originalCwd;
|
|
10
|
+
beforeEach(() => {
|
|
11
|
+
originalCwd = process.cwd();
|
|
12
|
+
process.chdir(FIXTURE_DIR);
|
|
13
|
+
});
|
|
14
|
+
afterEach(() => process.chdir(originalCwd));
|
|
15
|
+
const fixture = (name) => new ExistingFile(name);
|
|
11
16
|
const NESTED_FIXTURE = {
|
|
12
17
|
storages: { datasets: { default: { title: 'Default' } } },
|
|
13
18
|
overrideActorContext: ['../shared', '.'],
|
|
@@ -30,23 +35,6 @@ describe('safeReadJsonObjectFile', () => {
|
|
|
30
35
|
});
|
|
31
36
|
});
|
|
32
37
|
describe('filesystem-level handling', () => {
|
|
33
|
-
it('fails when the path does not exist', () => {
|
|
34
|
-
const filePath = fixture('does-not-exist.json');
|
|
35
|
-
const result = safeReadJsonObjectFile(filePath);
|
|
36
|
-
expect(result).toMatchObject({
|
|
37
|
-
success: false,
|
|
38
|
-
reason: 'unreadable',
|
|
39
|
-
});
|
|
40
|
-
});
|
|
41
|
-
// The fixture is named `directory.json` on purpose — the check is `stat().isFile()`, not the extension.
|
|
42
|
-
it('fails when the path is a directory', () => {
|
|
43
|
-
const filePath = fixture('directory.json');
|
|
44
|
-
const result = safeReadJsonObjectFile(filePath);
|
|
45
|
-
expect(result).toMatchObject({
|
|
46
|
-
success: false,
|
|
47
|
-
reason: 'not-a-file',
|
|
48
|
-
});
|
|
49
|
-
});
|
|
50
38
|
// Regression guard: `lstat` would report the link itself as "not a file" and reject it, even
|
|
51
39
|
// though `readFile` follows symlinks and would have read the target without complaint.
|
|
52
40
|
it('follows a symlink to its target file', () => {
|
|
@@ -56,11 +44,12 @@ describe('safeReadJsonObjectFile', () => {
|
|
|
56
44
|
// Git only tracks the executable bit, so this is the one case whose fixture cannot carry its own
|
|
57
45
|
// mode — `unreadable.json` is committed readable and stripped of permissions just for this test.
|
|
58
46
|
describe('unreadable file', () => {
|
|
59
|
-
const filePath =
|
|
47
|
+
const filePath = 'unreadable.json';
|
|
60
48
|
afterEach(async () => fs.chmod(filePath, 0o644));
|
|
61
49
|
it.runIf(process.getuid?.() !== 0)('fails when the file exists but cannot be read', async () => {
|
|
50
|
+
const file = fixture(filePath);
|
|
62
51
|
await fs.chmod(filePath, 0o000);
|
|
63
|
-
const result = safeReadJsonObjectFile(
|
|
52
|
+
const result = safeReadJsonObjectFile(file);
|
|
64
53
|
expect(result).toMatchObject({
|
|
65
54
|
success: false,
|
|
66
55
|
reason: 'unreadable',
|
|
@@ -99,13 +88,13 @@ describe('safeReadJsonObjectFile', () => {
|
|
|
99
88
|
const filePath = fixture('malformed.json');
|
|
100
89
|
const result = safeReadJsonObjectFile(filePath);
|
|
101
90
|
expect(result).toMatchObject({ success: false, reason: 'invalid-json' });
|
|
102
|
-
expect(result.failure.message).toContain(`Failed to parse ${filePath}`);
|
|
91
|
+
expect(result.failure.message).toContain(`Failed to parse ${filePath.path}`);
|
|
103
92
|
});
|
|
104
93
|
it('fails on an empty file', () => {
|
|
105
94
|
const filePath = fixture('empty.json');
|
|
106
95
|
const result = safeReadJsonObjectFile(filePath);
|
|
107
96
|
expect(result).toMatchObject({ success: false, reason: 'invalid-json' });
|
|
108
|
-
expect(result.failure.message).toContain(`Failed to parse ${filePath}`);
|
|
97
|
+
expect(result.failure.message).toContain(`Failed to parse ${filePath.path}`);
|
|
109
98
|
});
|
|
110
99
|
it.fails('reads jsonc', () => {
|
|
111
100
|
const filePath = fixture('comments.jsonc');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../../../../test/unit/bin/utils/files.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../../../../test/unit/bin/utils/files.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repo-relative.test.d.ts","sourceRoot":"","sources":["../../../../../../test/unit/bin/utils/path/repo-relative.test.ts"],"names":[],"mappings":""}
|