Skip to content

Commit

Permalink
test: ensure all "package/X" scope derivation rules are more thorough…
Browse files Browse the repository at this point in the history 
…ly tested
  • Loading branch information
@Xunnamius
Xunnamius committed Apr 4, 2022
1 parent 9164dab commit b03f0ae
Show file tree
Hide file tree
Showing 2 changed files with 197 additions and 11 deletions.
80 changes: 80 additions & 0 deletions test/integration-client.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,86 @@ it('both staged and non-staged paths are added and committed properly', async ()
});
});

it('"packages/package-name/..." paths are committed with commit scope "packages/package-name" when using --scope-root', async () => {
expect.hasAssertions();

await withMockedFixture(async ({ root, git }) => {
if (!git) throw new Error('must use git-repository fixture');

await run(
'mkdir',
[
'-p',
'packages/pkg-1',
'packages/pkg-2/script-a',
'packages/pkg-3/script-b',
'packages/pkg-4/script-c',
'packages/pkg-5/script-d'
],
{ cwd: root, reject: true }
);

await run(
'touch',
[
'packages/pkg-1/script.js',
'packages/pkg-2/script-a/script.js',
'packages/pkg-3/script-b/script.js',
'packages/pkg-4/script-c/script.js',
'packages/pkg-5/script-d/script1.js',
'packages/pkg-5/script-d/script2.js'
],
{ cwd: root, reject: true }
);

await run(CLI_BIN_PATH, ['::pkg-1', 'fix', '---', 'super complex add 1'], {
cwd: root,
reject: true
});

let commit = await git.show();
expect(commit).toInclude('fix(packages/pkg-1): super complex add 1');
expect(commit).toInclude('a/packages/pkg-1/script.js');

await run(
CLI_BIN_PATH,
['packages/pkg-2/script-a/script.js', 'fix', '---', 'super complex add 2'],
{
cwd: root,
reject: true
}
);

commit = await git.show();
expect(commit).toInclude('fix(packages/pkg-2): super complex add 2');
expect(commit).toInclude('a/packages/pkg-2/script-a/script.js');

await run(
CLI_BIN_PATH,
['packages/pkg-3', '::pkg-4', 'fix', '---', 'super complex add 3'],
{
cwd: root,
reject: true
}
);

commit = await git.show();
expect(commit).toInclude('fix(packages/pkg-3): super complex add 3');
expect(commit).toInclude('a/packages/pkg-3/script-b/script.js');
expect(commit).toInclude('a/packages/pkg-4/script-c/script.js');

await run(CLI_BIN_PATH, ['::pkg-5', 'refactor', '---', 'super complex add 4'], {
cwd: root,
reject: true
});

commit = await git.show();
expect(commit).toInclude('refactor(packages/pkg-5): super complex add 4');
expect(commit).toInclude('a/packages/pkg-5/script-d/script1.js');
expect(commit).toInclude('a/packages/pkg-5/script-d/script2.js');
});
});

it('"external*/..." paths are committed with commit scope "externals" when using --scope-root', async () => {
expect.hasAssertions();

Expand Down
128 changes: 117 additions & 11 deletions test/unit-index.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,30 +238,46 @@ describe('::configureProgram', () => {
});
});

it('colon works as monorepo pathspec shortcut', async () => {
it('double-colon works as monorepo pseudo-pathspec path shortcut', async () => {
expect.hasAssertions();

mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({ ambiguous: false, file: 'packages/pkg-1/src/file.js' })
);
mockedGetGitRepoRoot.mockImplementation(() => Promise.resolve('/repo-root'));

await withMocks(async () => {
mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({ ambiguous: false, file: 'packages/pkg-1/src/file.js' })
);

await expect(runProgram(['::', 'type', '--', 'message 0'])).resolves.toBeDefined();

expect(mockedFullname).toBeCalledWith('/repo-root/packages/');
expect(mockedMakeCommit).toBeCalledWith('type(file.js): message 0', true, false);

mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({ ambiguous: false, file: 'packages/pkg-1/src/file.js' })
);

await expect(
runProgram(['::pkg-1', 'type', '--', 'message'])
runProgram(['::pkg-1', 'type', '--', 'message 1'])
).resolves.toBeDefined();
expect(mockedMakeCommit).toBeCalledWith('type(file.js): message', true, false);

expect(mockedFullname).toBeCalledWith('/repo-root/packages/pkg-1');
expect(mockedMakeCommit).toBeCalledWith('type(file.js): message 1', true, false);

mockedFullname.mockImplementationOnce(() => Promise.reject('#2'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({ ambiguous: false, file: 'packages/pkg-1/src/index.ts' })
);

await expect(
runProgram(['::pkg-1/src/index.ts', 'type', '---', 'message'])
runProgram(['::pkg-1/src/index.ts', 'type', '---', 'message 2'])
).resolves.toBeDefined();

expect(mockedFullname).toBeCalledWith('/repo-root/packages/pkg-1/src/index.ts');
expect(mockedMakeCommit).toBeCalledWith(
'type(packages/pkg-1): message',
'type(packages/pkg-1): message 2',
true,
false
);
Expand All @@ -272,10 +288,100 @@ describe('::configureProgram', () => {
);

await expect(
runProgram(['packages/pkg-1/src/index.ts', 'type', '---', 'message'])
runProgram(['packages/pkg-1/src/index.ts', 'type', '---', 'message 3'])
).resolves.toBeDefined();

expect(mockedFullname).toBeCalledWith('/repo-root/packages/pkg-1/src/index.ts');
expect(mockedMakeCommit).toBeCalledWith(
'type(packages/pkg-1): message 3',
true,
false
);
});
});

it('"packages/package-name/..." paths are committed with commit scope "packages/package-name" when using --scope-root', async () => {
expect.hasAssertions();

await withMocks(async () => {
mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({ ambiguous: false, file: 'packages/pkg-1/script.ts' })
);

await expect(
runProgram(['packages/pkg-1/script.ts', 'type', '---', 'message 1'])
).resolves.toBeDefined();
expect(mockedMakeCommit).toBeCalledWith(
'type(packages/pkg-1): message 1',
true,
false
);

mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({ ambiguous: false, file: 'packages/pkg-1/script-a/index.ts' })
);

await expect(
runProgram(['../../packages/pkg-1/script-a/index.ts', 'type', '---', 'message 2'])
).resolves.toBeDefined();
expect(mockedMakeCommit).toBeCalledWith(
'type(packages/pkg-1): message 2',
true,
false
);
});
});

it('ambiguous "packages/package-name/..." paths are committed with proper commit scope when using --scope-root', async () => {
expect.hasAssertions();

mockedGetGitRepoRoot.mockImplementation(() => Promise.resolve('/repo-root'));

await withMocks(async () => {
mockedCommonAncestor.mockReturnValueOnce('packages');
mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({
ambiguous: true,
files: ['packages/pkg-1/script.ts', 'packages/pkg-2/script.ts']
})
);

await expect(
runProgram(['packages/**/*', 'type', '---', 'message 1'])
).resolves.toBeDefined();
expect(mockedMakeCommit).toBeCalledWith('type(packages): message 1', true, false);

mockedCommonAncestor.mockReturnValueOnce('packages');
mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({
ambiguous: true,
files: ['packages/pkg-1/script-a/index.ts', 'packages/pkg-2/script-b/index.ts']
})
);

await expect(
runProgram(['../../packages', 'type', '---', 'message 2'])
).resolves.toBeDefined();
expect(mockedMakeCommit).toBeCalledWith('type(packages): message 2', true, false);

mockedCommonAncestor.mockReturnValueOnce('packages/pkg-1');
mockedFullname.mockImplementationOnce(() => Promise.reject('#1'));
mockedFullname.mockReturnValueOnce(
Promise.resolve({
ambiguous: true,
files: ['packages/pkg-1/script-a/index.ts', 'packages/pkg-1/script-b/index.ts']
})
);

await expect(
runProgram(['::pkg-1', 'type', '---', 'message 3'])
).resolves.toBeDefined();
expect(mockedMakeCommit).toBeCalledWith(
'type(packages/pkg-1): message',
'type(packages/pkg-1): message 3',
true,
false
);
Expand Down

0 comments on commit b03f0ae

Please sign in to comment.