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

test(build): avoid race condition in destructive test #9828

Merged
merged 2 commits into from
Oct 30, 2023
Merged

test(build): avoid race condition in destructive test #9828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07e8b86
test(build): avoid race condition
caugner Oct 16, 2023
8fec580
refactor(test): extract extractMatchesFromString()
caugner Oct 16, 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
42 changes: 32 additions & 10 deletions testing/tests/destructive.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ function* walker(root) {
}
}

function extractMatchesFromString(pattern: RegExp, str: string) {
const matches = [];

let match: string[];
while ((match = pattern.exec(str)) !== null) {
matches.push(match[1] ?? match[0]);
}

return matches;
}

describe("fixing flaws", () => {
const pattern = path.join("web", "fixable_flaws");
const baseDir = path.resolve(".");
Expand Down Expand Up @@ -79,12 +90,13 @@ describe("fixing flaws", () => {
});

it("can be run in dry-run mode", () => {
const root = path.join(tempContentDir, "files");
const stdout = execSync("yarn build", {
cwd: baseDir,
windowsHide: true,
env: Object.assign(
{
CONTENT_ROOT: path.join(tempContentDir, "files"),
CONTENT_ROOT: root,
BUILD_OUT_ROOT: tempBuildDir,
BUILD_FIX_FLAWS: "true",
BUILD_FIX_FLAWS_DRY_RUN: "true",
Expand All @@ -94,15 +106,25 @@ describe("fixing flaws", () => {
),
}).toString();

const regexPattern = /Would modify "(.*)"./g;
const dryRunNotices = stdout
.split("\n")
.filter((line) => regexPattern.test(line));
expect(dryRunNotices).toHaveLength(4);
expect(dryRunNotices[0]).toContain(pattern);
expect(dryRunNotices[1]).toContain(path.join(pattern, "bad_pre_tags"));
expect(dryRunNotices[2]).toContain(path.join(pattern, "deprecated_macros"));
expect(dryRunNotices[3]).toContain(path.join(pattern, "images"));
const wouldModify = extractMatchesFromString(
/Would modify "(.*)"./g,
stdout
);

expect(wouldModify).toHaveLength(4);
expect(wouldModify).toContain(
path.join(root, "en-us", pattern, "index.html")
);
expect(wouldModify).toContain(
path.join(root, "en-us", pattern, "bad_pre_tags", "index.html")
);
expect(wouldModify).toContain(
path.join(root, "en-us", pattern, "deprecated_macros", "index.html")
);
expect(wouldModify).toContain(
path.join(root, "en-us", pattern, "images", "index.html")
);

const dryrunFiles = getChangedFiles(tempContentDir);
expect(dryrunFiles).toHaveLength(0);
});
Expand Down
Loading