Undo change to SearchSource.js due to jestjs#7146; address other feed…

…back
willsmythe · Jan 14, 2019 · dcafcfd · dcafcfd
1 parent abf9347
commit dcafcfd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/jest-cli/src/SearchSource.js b/packages/jest-cli/src/SearchSource.js
@@ -19,7 +19,6 @@ import testPathPatternToRegExp from './testPathPatternToRegexp';
 import {escapePathForRegex} from 'jest-regex-util';
 import {replaceRootDirInPath} from 'jest-config';
 import {buildSnapshotResolver} from 'jest-snapshot';
-import {sync as realpath} from 'realpath-native';
 
 type SearchResult = {|
   noSCM?: boolean,

diff --git a/packages/jest-config/src/getCacheDirectory.js b/packages/jest-config/src/getCacheDirectory.js
@@ -14,16 +14,15 @@ import {sync as realpath} from 'realpath-native';
 
 const getCacheDirectory = () => {
   const {getuid} = process;
+  const tmpdir = path.join(realpath(os.tmpdir()), 'jest');
   if (getuid == null) {
-    return path.join(realpath(os.tmpdir()), 'jest');
+    return tmpdir;
+  } else {
+    // On some platforms tmpdir() is `/tmp`, causing conflicts between different
+    // users and permission issues. Adding an additional subdivision by UID can
+    // help.
+    return `${tmpdir}_${getuid.call(process).toString(36)}`;
   }
-  // On some platforms tmpdir() is `/tmp`, causing conflicts between different
-  // users and permission issues. Adding an additional subdivision by UID can
-  // help.
-  return path.join(
-    realpath(os.tmpdir()),
-    'jest_' + getuid.call(process).toString(36),
-  );
 };
 
 export default getCacheDirectory;