Skip to content
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

Adds tests for the pack list generation #5873

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Adds tests for the pack list generation #5873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cabbfc
Adds tests for the pack list
arcanis Oct 26, 2023
dd587aa
Adds tests for the pack list generation
arcanis Oct 26, 2023
af64fe0
Updates the tests
arcanis Oct 26, 2023
f1875e6
Fixes lint
arcanis Oct 26, 2023
2df47cb
Removes a duplicate util
arcanis Oct 26, 2023
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
2 changes: 2 additions & 0 deletions .yarn/versions/5452f3ea.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
declined:
- "@yarnpkg/core"
159 changes: 156 additions & 3 deletions packages/acceptance-tests/pkg-tests-specs/sources/commands/pack.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import {xfs, npath} from '@yarnpkg/fslib';
import {fs as fsUtils} from 'pkg-tests-core';
import tar from 'tar';
import {xfs, npath} from '@yarnpkg/fslib';
import {fs as fsUtils, misc} from 'pkg-tests-core';
import tar from 'tar';

async function genPackList(run) {
const {stdout} = await run(`pack`, `--dry-run`, `--json`);

return misc.parseJsonStream(stdout).map(entry => {
return entry.location;
}).filter(location => !!location);
}

describe(`Commands`, () => {
describe(`pack`, () => {
Expand Down Expand Up @@ -316,6 +324,151 @@ describe(`Commands`, () => {
}),
);

test(
`it should support gitignore patterns (*)`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `x.js\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`foo/y.js`,
`package.json`,
`y.js`,
]);
}),
);

test(
`it should allow to explicitly add back a file excluded by a gitignore`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `*.js\n!x.js\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`foo/x.js`,
`package.json`,
`x.js`,
]);
}),
);

test(
`it should allow to explicitly add back a single file excluded by a gitignore`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `*.js\n!/x.js\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`package.json`,
`x.js`,
]);
}),
);

test(
`it should support gitignore patterns (**)`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `**/x.js\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`foo/bar/y.js`,
`foo/y.js`,
`package.json`,
`x.js`, // TODO: This shouldn't be here; https://github.com/yarnpkg/berry/issues/5872
`y.js`,
]);
}),
);

test(
`it should keep digging inside excluded folders (unlike gitignore!)`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `*\n!x.js\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`foo/bar/x.js`,
`foo/x.js`,
`package.json`,
`x.js`,
]);
}),
);

test(
`it should keep digging inside excluded folders (unlike gitignore!)`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `*\n!x.js\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`foo/bar/x.js`,
`foo/x.js`,
`package.json`,
`x.js`,
]);
}),
);

// TODO: https://github.com/yarnpkg/berry/issues/5872
test.skip(
`it should be possible to re-exclude something which got not-excluded`,
makeTemporaryEnv({}, async ({path, run, source}) => {
await fsUtils.writeFile(`${path}/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/x.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/foo/bar/y.js`, `module.exports = 42;\n`);
await fsUtils.writeFile(`${path}/.gitignore`, `*\n!x.js\nfoo/bar\n`);

await run(`install`);

await expect(genPackList(run)).resolves.toEqual([
`foo/x.js`,
`package.json`,
`x.js`,
]);
}),
);

test(
`it should override fields in the packed manifest`,
makeTemporaryEnv({
Expand Down