Enable manual mocks with nested folders

packages/jest-haste-map/src/__tests__/__snapshots__/index-test.js.snap

@@ -14,14 +14,14 @@ exports[`HasteMap tries to crawl using node as a fallback 1`] = `
 
 exports[`HasteMap warns on duplicate mock files 1`] = `
 "jest-haste-map: duplicate manual mock found:
-  Module name: blueberry
-  Duplicate Mock path: /fruits/__mocks__/subdir2/blueberry.js
+  Module name: subdir/blueberry
+  Duplicate Mock path: /fruits2/__mocks__/subdir/blueberry.js
 This warning is caused by two manual mock files with the same file name.
 Jest will use the mock file found in: 
-/fruits/__mocks__/subdir2/blueberry.js
+/fruits2/__mocks__/subdir/blueberry.js
  Please delete one of the following two files: 
- /fruits/__mocks__/subdir1/blueberry.js
-/fruits/__mocks__/subdir2/blueberry.js
+ /fruits1/__mocks__/subdir/blueberry.js
+/fruits2/__mocks__/subdir/blueberry.js
 
 "
 `;

packages/jest-haste-map/src/__tests__/getMockName-test.js

@@ -0,0 +1,22 @@
+const path = require('path');
+const getMockName = require('../getMockName');
+
+describe('getMockName', () => {
+  it('extracts mock name from file path', () => {
+    expect(
+      getMockName(path.join('a', '__b__', 'c.js'), /__b__/)
+    ).toBe('c');
+
+    expect(
+      getMockName(path.join('a', '__b__', 'index.js'), /__b__/)
+    ).toBe('index');
+
+    expect(
+      getMockName(path.join('a', '__b__', 'c', 'd.js'), /__b__/)
+    ).toBe(path.join('c', 'd'));
+
+    expect(
+      getMockName(path.join('a', '__b__', 'c', 'd', 'index.js'), /__b__/)
+    ).toBe(path.join('c', 'd'));
+  });
+});

packages/jest-haste-map/src/__tests__/index-test.js

@@ -322,12 +322,12 @@ describe('HasteMap', () => {
 
   it('warns on duplicate mock files', () => {
     // Duplicate mock files for blueberry
-    mockFs['/fruits/__mocks__/subdir1/blueberry.js'] = [
+    mockFs['/fruits1/__mocks__/subdir/blueberry.js'] = [
       '/**',
       ' * @providesModule Blueberry1',
       ' */',
     ].join('\n');
-    mockFs['/fruits/__mocks__/subdir2/blueberry.js'] = [
+    mockFs['/fruits2/__mocks__/subdir/blueberry.js'] = [
       '/**',
       ' * @providesModule Blueberry2',
       ' */',

packages/jest-haste-map/src/getMockName.js

@@ -0,0 +1,13 @@
+const path = require('path');
+
+const getMockName = (filePath, mocksPattern) => {
+  const modulePath = filePath.split(mocksPattern)[1];
+
+  const extractMockName = new RegExp(
+    `^\\${path.sep}?(.*?)(\\${path.sep}index)?\\${path.extname(modulePath)}$`
+  );
+
+  return extractMockName.exec(modulePath)[1];
+};
+
+module.exports = getMockName;

packages/jest-haste-map/src/index.js

@@ -23,6 +23,7 @@ const {EventEmitter} = require('events');
 const H = require('./constants');
 const HasteFS = require('./HasteFS');
 const HasteModuleMap = require('./ModuleMap');
+const getMockName = require('./getMockName');
 
 const crypto = require('crypto');
 const execSync = require('child_process').execSync;
@@ -95,7 +96,6 @@ const canUseWatchman = ((): boolean => {
 const escapePathSeparator =
   string => (path.sep === '\\') ? string.replace(/(\/|\\)/g, '\\\\') : string;
 
-const getMockName = filePath => path.basename(filePath, path.extname(filePath));
 const getWhiteList = (list: ?Array<string>): ?RegExp => {
   if (list && list.length) {
     return new RegExp(
@@ -327,7 +327,7 @@ class HasteMap extends EventEmitter {
       this._options.mocksPattern &&
       this._options.mocksPattern.test(filePath)
     ) {
-      const mockPath = getMockName(filePath);
+      const mockPath = getMockName(filePath, this._options.mocksPattern);
       if (mocks[mockPath]) {
         this._console.warn(
           `jest-haste-map: duplicate manual mock found:\n` +
@@ -617,7 +617,7 @@ class HasteMap extends EventEmitter {
           this._options.mocksPattern &&
           this._options.mocksPattern.test(filePath)
         ) {
-          const mockName = getMockName(filePath);
+          const mockName = getMockName(filePath, this._options.mocksPattern);
           delete hasteMap.mocks[mockName];
         }
 

packages/jest-runtime/src/__tests__/Runtime-mock-test.js

@@ -9,6 +9,8 @@
  */
 'use strict';
 
+const path = require('path');
+
 let createRuntime;
 
 describe('Runtime', () => {
@@ -27,6 +29,7 @@ describe('Runtime', () => {
 
         root.jest.mock('RegularModule', () => mockReference);
         root.jest.mock('ManuallyMocked', () => mockReference);
+        root.jest.mock(path.join('nested1', 'nested2', 'nested3'));
 
         expect(
           runtime.requireModuleOrMock(runtime.__mockRootPath, 'RegularModule'),
@@ -35,6 +38,12 @@ describe('Runtime', () => {
         expect(
           runtime.requireModuleOrMock(runtime.__mockRootPath, 'RegularModule'),
         ).toEqual(mockReference);
+
+        expect(
+          runtime.requireModuleOrMock(
+            runtime.__mockRootPath, path.join('nested1', 'nested2', 'nested3')
+          ),
+        ).toEqual(mockReference);
       }),
     );
 

packages/jest-runtime/src/__tests__/test_root/__mocks__/nested1/nested2/nested3.js

@@ -0,0 +1,3 @@
+'use strict';
+
+exports.isMock = true;

packages/jest-runtime/src/__tests__/test_root/nested1/nested2/nested3.js

@@ -0,0 +1,3 @@
+'use strict';
+
+exports.isMock = false;