Add path case-insensitivity if onlyChanged option is active, fixes #4644

(#4730) * Correct project directory path case on Windows * fixup! Add try-catch block with fallback * Make only_changed test pass on Windows * Add test * Update changelog * fixup! Simplify original writeFiles change * fixup! Ignore process.binding flow error * fixup! Use correct dir * fixup! Fix lint error
jestjs · Nov 17, 2017 · 84fe06a · 84fe06a
1 parent 706b1c9
commit 84fe06a
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,6 @@
 ## master
 
 ### Fixes
-
 * `[expect]` fix .toThrow for promises
   ([#4884](https://github.com/facebook/jest/pull/4884))
 * `[jest-docblock]` pragmas should preserve urls
@@ -44,6 +43,9 @@
   thrown by pretty-format ([#4787](https://github.com/facebook/jest/pull/4787))
 * `[jest-environment-jsdom]` Fix asynchronous test will fail due to timeout
   issue. ([#4669](https://github.com/facebook/jest/pull/4669))
+* `[jest-cli]` Fix `--onlyChanged` path case sensitivity on Windows platform
+  ([#4730](https://github.com/facebook/jest/pull/4730))
+
 
 ### Features
 

diff --git a/integration_tests/__tests__/only_changed.test.js b/integration_tests/__tests__/only_changed.test.js
@@ -14,13 +14,10 @@ import os from 'os';
 import path from 'path';
 const {cleanup, run, writeFiles} = require('../utils');
 
-const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'jest_only_changed');
 const GIT = 'git -c user.name=jest_test -c user.email=jest_test@test.com';
 const HG = 'hg --config ui.username=jest_test';
 
-skipOnWindows.suite();
-
 beforeEach(() => cleanup(DIR));
 afterEach(() => cleanup(DIR));
 
@@ -45,7 +42,7 @@ test('run only changed files', () => {
   expect(stdout).toMatch('No tests found related to files');
 
   ({stderr} = runJest(DIR, ['-o', '--lastCommit']));
-  expect(stderr).toMatch('PASS __tests__/file1.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file1.test.js/);
 
   writeFiles(DIR, {
     '__tests__/file2.test.js': `require('../file2'); test('file2', () => {});`,
@@ -56,9 +53,9 @@ test('run only changed files', () => {
 
   ({stderr} = runJest(DIR, ['-o']));
 
-  expect(stderr).not.toMatch('PASS __tests__/file1.test.js');
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
+  expect(stderr).not.toMatch(/PASS __tests__(\/|\\)file1.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
 
   run(`${GIT} add .`, DIR);
   run(`${GIT} commit -m "second"`, DIR);
@@ -71,9 +68,9 @@ test('run only changed files', () => {
   });
 
   ({stderr} = runJest(DIR, ['-o']));
-  expect(stderr).not.toMatch('PASS __tests__/file1.test.js');
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
+  expect(stderr).not.toMatch(/PASS __tests__(\/|\\)file1.test.j/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
 });
 
 test('onlyChanged in config is overwritten by --all or testPathPattern', () => {
@@ -100,7 +97,7 @@ test('onlyChanged in config is overwritten by --all or testPathPattern', () => {
   );
 
   ({stderr} = runJest(DIR, ['--lastCommit']));
-  expect(stderr).toMatch('PASS __tests__/file1.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file1.test.js/);
 
   writeFiles(DIR, {
     '__tests__/file2.test.js': `require('../file2'); test('file2', () => {});`,
@@ -111,9 +108,9 @@ test('onlyChanged in config is overwritten by --all or testPathPattern', () => {
 
   ({stderr} = runJest(DIR));
 
-  expect(stderr).not.toMatch('PASS __tests__/file1.test.js');
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
+  expect(stderr).not.toMatch(/PASS __tests__(\/|\\)file1.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
 
   run(`${GIT} add .`, DIR);
   run(`${GIT} commit -m "second"`, DIR);
@@ -123,22 +120,22 @@ test('onlyChanged in config is overwritten by --all or testPathPattern', () => {
 
   ({stderr, stdout} = runJest(DIR, ['file2.test.js']));
   expect(stdout).not.toMatch('No tests found related to files');
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
   expect(stderr).toMatch('1 total');
 
   writeFiles(DIR, {
     'file2.js': 'module.exports = {modified: true}',
   });
 
   ({stderr} = runJest(DIR));
-  expect(stderr).not.toMatch('PASS __tests__/file1.test.js');
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
+  expect(stderr).not.toMatch(/PASS __tests__(\/|\\)file1.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
 
   ({stderr} = runJest(DIR, ['--all']));
-  expect(stderr).toMatch('PASS __tests__/file1.test.js');
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file1.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
 });
 
 test('gets changed files for hg', async () => {
@@ -173,7 +170,7 @@ test('gets changed files for hg', async () => {
   });
 
   ({stdout, stderr} = runJest(DIR, ['-o']));
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
 
   run(`${HG} add .`, DIR);
   run(`${HG} commit -m "test2"`, DIR);
@@ -183,10 +180,47 @@ test('gets changed files for hg', async () => {
   });
 
   ({stdout, stderr} = runJest(DIR, ['-o']));
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
-  expect(stderr).not.toMatch('PASS __tests__/file2.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
+  expect(stderr).not.toMatch(/PASS __tests__(\/|\\)file2.test.js/);
 
   ({stdout, stderr} = runJest(DIR, ['-o', '--changedFilesWithAncestor']));
-  expect(stderr).toMatch('PASS __tests__/file2.test.js');
-  expect(stderr).toMatch('PASS __tests__/file3.test.js');
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
+});
+
+test('path on Windows is case-insensitive', () => {
+  if (process.platform !== 'win32') {
+    // This test is Windows specific, skip it on other platforms.
+    return;
+  }
+
+  const modifiedDIR = path.resolve(DIR, 'outer_dir', 'inner_dir');
+  const incorrectModifiedDIR = path.resolve(DIR, 'OUTER_dir', 'inner_dir');
+
+  writeFiles(modifiedDIR, {
+    '.watchmanconfig': '',
+    '__tests__/file1.test.js': `require('../file1'); test('file1', () => {});`,
+    'file1.js': 'module.exports = {}',
+    'package.json': '{}',
+  });
+
+  run(`${GIT} init`, modifiedDIR);
+  run(`${GIT} add .`, modifiedDIR);
+  run(`${GIT} commit -m "first"`, modifiedDIR);
+
+  const {stdout} = runJest(incorrectModifiedDIR, ['-o']);
+  expect(stdout).toMatch('No tests found related to files');
+
+  writeFiles(modifiedDIR, {
+    '__tests__/file2.test.js': `require('../file2'); test('file2', () => {});`,
+    '__tests__/file3.test.js': `require('../file3'); test('file3', () => {});`,
+    'file2.js': 'module.exports = {}',
+    'file3.js': `require('./file2')`,
+  });
+
+  const {stderr} = runJest(incorrectModifiedDIR, ['-o']);
+
+  expect(stderr).not.toMatch(/PASS __tests__(\/|\\)file1.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file2.test.js/);
+  expect(stderr).toMatch(/PASS __tests__(\/|\\)file3.test.js/);
 });
diff --git a/integration_tests/utils.js b/integration_tests/utils.js
@@ -82,7 +82,7 @@ const cleanup = (directory: string) => rimraf.sync(directory);
 const writeFiles = (directory: string, files: {[filename: string]: string}) => {
   mkdirp.sync(directory);
   Object.keys(files).forEach(fileOrPath => {
-    const filePath = fileOrPath.split(path.sep); // ['tmp', 'a.js']
+    const filePath = fileOrPath.split('/'); // ['tmp', 'a.js']
     const filename = filePath.pop(); // filepath becomes dirPath (no filename)
 
     if (filePath.length) {

diff --git a/packages/jest-cli/src/cli/index.js b/packages/jest-cli/src/cli/index.js
@@ -141,6 +141,16 @@ const getProjectListFromCLIArgs = (argv, project: ?Path) => {
     projects.push(project);
   }
 
+  if (!projects.length && process.platform === 'win32') {
+    try {
+      // $FlowFixMe
+      projects.push(process.binding('fs').realpath(process.cwd()));
+    } catch (err) {
+      // do nothing, just catch error
+      // process.binding('fs').realpath can throw, e.g. on mapped drives
+    }
+  }
+
   if (!projects.length) {
     projects.push(process.cwd());
   }