Skip to content

Fix Jest tests that fail on Windows #896

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
endiliey merged 2 commits into from
Aug 10, 2018
Merged

Fix Jest tests that fail on Windows #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2079178
Fix failing tests
Aug 10, 2018
2a67560
Suppress build output in build tests
Aug 10, 2018
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: 1 addition & 1 deletion lib/__tests__/build-files.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ let outputAssetsFiles = [];

function generateSite() {
shell.cd('website');
shell.exec('yarn build');
shell.exec('yarn build', {silent: true});
}

function clearBuildFolder() {
Expand Down
3 changes: 2 additions & 1 deletion lib/server/__tests__/docs.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ describe('getFile', () => {
fs.existsSync = jest.fn().mockReturnValue(true);
fs.readFileSync = jest.fn().mockImplementation(file => {
const fakePath = file.replace(process.cwd().replace(/website$/, ''), '');
return fakeContent[fakePath];
const normalizedPath = fakePath.replace(/\\/g, '/');
return fakeContent[normalizedPath];
});

test('docs does not exist', () => {
Expand Down
4 changes: 3 additions & 1 deletion lib/server/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ function getSubDir(file, refDir) {
}

function getLanguage(file, refDir) {
const separator = escapeStringRegexp(path.sep);
const baseDir = escapeStringRegexp(path.basename(refDir));
const regexSubFolder = new RegExp(
`${escapeStringRegexp(path.basename(refDir))}/(.*?)/.*`
`${baseDir}${separator}(.*?)${separator}.*`
);
const match = regexSubFolder.exec(file);

Expand Down