Skip to content

test: correct execution of test and dev scripts on Windows machines #4926

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

Merged
merged 4 commits into from
May 10, 2022
Merged

test: correct execution of test and dev scripts on Windows machines #4926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
842f355
test: correct execution of test and dev scripts on Windows machines
armano2 May 9, 2022
4c7603d
test: enable shell process.spawn only for windows
armano2 May 10, 2022
598d0df
Merge remote-tracking branch 'origin/main' into test/executing-tests-…
armano2 May 10, 2022
41a4536
test: allow to run ONLY in ast-fixtures for windows
armano2 May 10, 2022
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
1 change: 1 addition & 0 deletions packages/types/tools/copy-ast-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ async function execAsync(
return new Promise((resolve, reject) => {
const child = childProcess.spawn(command, args, {
...options,
shell: process.platform === 'win32',
stdio: 'inherit',
});

Expand Down
6 changes: 4 additions & 2 deletions packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ class FixturesTester {
return this.fixtures
.map(fixture =>
glob
.sync(`${fixture.directory}/${fixture.pattern}`, {})
.sync(fixture.pattern, {
cwd: fixture.directory,
absolute: true,
})
.map(filename => ({
filename,
ignoreSourceType: fixture.ignoreSourceType,
Expand Down Expand Up @@ -346,7 +349,6 @@ tester.addFixturePatternConfig('typescript/basics', {
/**
* Not yet supported in Babel
* Directive field is not added to module and namespace
* @see https://github.com/babel/babel/issues/9228
*/
'directive-in-module',
'directive-in-namespace',
Expand Down
28 changes: 15 additions & 13 deletions packages/typescript-estree/tests/ast-fixtures.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ addSerializer(serializer);
// prettier-ignore
const ONLY = [].join(path.sep);

const FIXTURES_DIR = path.resolve(
const fixturesDir = path.resolve(
__dirname,
'..',
'..',
Expand All @@ -25,15 +25,15 @@ const FIXTURES_DIR = path.resolve(
'shared-fixtures',
'fixtures',
);
const SNAPSHOTS_DIR = path.resolve(__dirname, 'snapshots');
const snapshotsDir = path.resolve(__dirname, 'snapshots');

const fixtures = glob
.sync(`${FIXTURES_DIR}/**/*.src.{js,ts,jsx,tsx}`)
.sync(`**/*.src.{js,ts,jsx,tsx}`, { cwd: fixturesDir, absolute: true })
.map(absolute => {
const relative = path.relative(FIXTURES_DIR, absolute);
const relative = path.relative(fixturesDir, absolute);
const { name, dir, ext } = path.parse(relative);
const segments = dir.split(path.sep);
const snapshotPath = path.join(SNAPSHOTS_DIR, dir);
const snapshotPath = path.join(snapshotsDir, dir);
return {
absolute,
isJsx: isJSXFileType(ext),
Expand Down Expand Up @@ -97,14 +97,16 @@ fixtures.forEach(f => nestDescribe(f));

if (ONLY === '') {
// ensure that the snapshots are cleaned up, because jest-specific-snapshot won't do this check
const snapshots = glob.sync(`${SNAPSHOTS_DIR}/**/*.shot`).map(absolute => {
const relative = path.relative(SNAPSHOTS_DIR, absolute);
const { name, dir } = path.parse(relative);
return {
relative,
fixturePath: path.join(FIXTURES_DIR, dir, name),
};
});
const snapshots = glob
.sync(`**/*.shot`, { cwd: snapshotsDir, absolute: true })
.map(absolute => {
const relative = path.relative(snapshotsDir, absolute);
const { name, dir } = path.parse(relative);
return {
relative,
fixturePath: path.join(fixturesDir, dir, name),
};
});

describe('ast snapshots should have an associated test', () => {
for (const snap of snapshots) {
Expand Down