Skip to content

Commit

Permalink
chore(ci): fix failing test on Windows (#10714)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Oct 26, 2020
1 parent 2e7ba01 commit 8849f37
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 77 deletions.
53 changes: 46 additions & 7 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

55 changes: 0 additions & 55 deletions .yarn/releases/yarn-2.3.1.cjs

This file was deleted.

55 changes: 55 additions & 0 deletions .yarn/releases/yarn-sources.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
Expand Up @@ -3,4 +3,4 @@


lastUpdateCheck 1576854265612
yarn-path ".yarn/releases/yarn-2.3.1.cjs"
yarn-path ".yarn/releases/yarn-sources.cjs"
2 changes: 1 addition & 1 deletion .yarnrc.yml
Expand Up @@ -6,4 +6,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: '@yarnpkg/plugin-interactive-tools'

yarnPath: .yarn/releases/yarn-2.3.1.cjs
yarnPath: .yarn/releases/yarn-sources.cjs
4 changes: 2 additions & 2 deletions e2e/coverage-remapping/yarn.lock
Expand Up @@ -25,10 +25,10 @@ typescript@^3.7.4:

"typescript@patch:typescript@^3.7.4#builtin<compat/typescript>":
version: 3.9.7
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=5bf698"
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=a72311"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: f0d3d9c987860c7c458229ab6dd7e3d322405db36b70abccba610b5efd9f9451e4e67a3fc7983c0d3741033c1f1a8d7aa859a1510caa8f20fad762fc39648bfa
checksum: c966d7ee887d9acdfb1126948e27325b6bdcfabe0c73eb232f5ec2e7429a3d03142aff68e319de4ed9a6bb0cc8590fc1f48311daae8927cf742ffc7f869f0338
languageName: node
linkType: hard
4 changes: 2 additions & 2 deletions e2e/stack-trace-source-maps-with-coverage/yarn.lock
Expand Up @@ -25,10 +25,10 @@ typescript@^3.7.4:

"typescript@patch:typescript@^3.7.4#builtin<compat/typescript>":
version: 3.9.7
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=5bf698"
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=a72311"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: f0d3d9c987860c7c458229ab6dd7e3d322405db36b70abccba610b5efd9f9451e4e67a3fc7983c0d3741033c1f1a8d7aa859a1510caa8f20fad762fc39648bfa
checksum: c966d7ee887d9acdfb1126948e27325b6bdcfabe0c73eb232f5ec2e7429a3d03142aff68e319de4ed9a6bb0cc8590fc1f48311daae8927cf742ffc7f869f0338
languageName: node
linkType: hard
4 changes: 2 additions & 2 deletions e2e/stack-trace-source-maps/yarn.lock
Expand Up @@ -25,10 +25,10 @@ typescript@^3.7.4:

"typescript@patch:typescript@^3.7.4#builtin<compat/typescript>":
version: 3.9.7
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=5bf698"
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=a72311"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: f0d3d9c987860c7c458229ab6dd7e3d322405db36b70abccba610b5efd9f9451e4e67a3fc7983c0d3741033c1f1a8d7aa859a1510caa8f20fad762fc39648bfa
checksum: c966d7ee887d9acdfb1126948e27325b6bdcfabe0c73eb232f5ec2e7429a3d03142aff68e319de4ed9a6bb0cc8590fc1f48311daae8927cf742ffc7f869f0338
languageName: node
linkType: hard
4 changes: 2 additions & 2 deletions e2e/typescript-coverage/yarn.lock
Expand Up @@ -25,10 +25,10 @@ typescript@^3.3.1:

"typescript@patch:typescript@^3.3.1#builtin<compat/typescript>":
version: 3.9.7
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=5bf698"
resolution: "typescript@patch:typescript@npm%3A3.9.7#builtin<compat/typescript>::version=3.9.7&hash=a72311"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: f0d3d9c987860c7c458229ab6dd7e3d322405db36b70abccba610b5efd9f9451e4e67a3fc7983c0d3741033c1f1a8d7aa859a1510caa8f20fad762fc39648bfa
checksum: c966d7ee887d9acdfb1126948e27325b6bdcfabe0c73eb232f5ec2e7429a3d03142aff68e319de4ed9a6bb0cc8590fc1f48311daae8927cf742ffc7f869f0338
languageName: node
linkType: hard
8 changes: 5 additions & 3 deletions packages/jest-cli/src/init/__tests__/init.test.js
Expand Up @@ -63,7 +63,9 @@ describe('init', () => {
const writtenJestConfigFilename = fs.writeFileSync.mock.calls[0][0];
const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];

expect(writtenJestConfigFilename.endsWith('.mjs')).toBe(true);
expect(path.basename(writtenJestConfigFilename)).toBe(
'jest.config.mjs',
);

expect(typeof writtenJestConfig).toBe('string');
expect(writtenJestConfig.split('\n')[5]).toBe('export default {');
Expand Down Expand Up @@ -205,7 +207,7 @@ describe('init', () => {
const jestConfigFileName = fs.writeFileSync.mock.calls[0][0];
const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];

expect(jestConfigFileName).toContain('/jest.config.ts');
expect(path.basename(jestConfigFileName)).toBe('jest.config.ts');
expect(writtenJestConfig.split('\n')[5]).toBe('export default {');
});

Expand All @@ -216,7 +218,7 @@ describe('init', () => {

const jestConfigFileName = fs.writeFileSync.mock.calls[0][0];

expect(jestConfigFileName).not.toContain('jest.config.ts');
expect(path.basename(jestConfigFileName)).not.toBe('jest.config.ts');
});
});
});
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Expand Up @@ -19200,11 +19200,11 @@ fsevents@^1.2.7:

"typescript@patch:typescript@*#builtin<compat/typescript>, typescript@patch:typescript@^4.0.2#builtin<compat/typescript>, typescript@patch:typescript@^4.0.3#builtin<compat/typescript>":
version: 4.0.3
resolution: "typescript@patch:typescript@npm%3A4.0.3#builtin<compat/typescript>::version=4.0.3&hash=5bf698"
resolution: "typescript@patch:typescript@npm%3A4.0.3#builtin<compat/typescript>::version=4.0.3&hash=a72311"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 72db87d09f728c83062d64b5e12ed52effb6278963b6bc5c006219b22c104e02b8ce80164261de554923d3c47d894a1ca937ed542328caccb83ebaedeae98a69
checksum: c92843a6af50170f49158b6eb5726b80c5c22074a337d066eee278a7d08d1109667e435e96207ab1314f63f4629555e89c26645ef55b937ea6baf80d190768f6
languageName: node
linkType: hard

Expand Down

0 comments on commit 8849f37

Please sign in to comment.