Fix Jest tests that fail on Windows (#896)

* Fix failing tests * Suppress build output in build tests
facebook · Aug 10, 2018 · 3f896c8 · 3f896c8
1 parent e27e18b
commit 3f896c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/__tests__/build-files.test.js b/lib/__tests__/build-files.test.js
@@ -28,7 +28,7 @@ let outputAssetsFiles = [];
 
 function generateSite() {
   shell.cd('website');
-  shell.exec('yarn build');
+  shell.exec('yarn build', {silent: true});
 }
 
 function clearBuildFolder() {

diff --git a/lib/server/__tests__/docs.test.js b/lib/server/__tests__/docs.test.js
@@ -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', () => {

diff --git a/lib/server/utils.js b/lib/server/utils.js
@@ -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);