Removes a code branch, fixes #4985 (#6036)

integration-tests/custom-resolver/__mocks__/manual-mock.js

@@ -0,0 +1 @@
+module.exports = require('bar');

integration-tests/custom-resolver/__tests__/custom-resolver.test.js

@@ -13,3 +13,18 @@ test('should use the custom resolver', () => {
 test('should have regenerator injected', () => {
   expect(global.fakeRegeneratorInjected).toEqual(true);
 });
+
+test('should work with automock', () => {
+  jest.mock('foo');
+
+  const foo = require('foo');
+  foo();
+
+  expect(foo).toHaveBeenCalled();
+});
+
+test('should allow manual mocks to make require calls through the resolver', () => {
+  jest.mock('../manual-mock');
+
+  expect(require('../manual-mock')).toEqual('bar');
+});

integration-tests/custom-resolver/bar.js

@@ -1 +1 @@
-module.exports = () => {};
+module.exports = 'bar';

integration-tests/custom-resolver/manual-mock.js

@@ -0,0 +1 @@
+throw new Error('Must be mocked');

packages/jest-resolve/src/__tests__/resolve.test.js

@@ -172,28 +172,6 @@ describe('getMockModule', () => {
       path.dirname(src),
     );
   });
-
-  it('is possible to use custom resolver to resolve deps inside mock modules without moduleNameMapper', () => {
-    userResolver.mockImplementation(() => 'module');
-
-    const moduleMap = new ModuleMap({
-      duplicates: [],
-      map: [],
-      mocks: [],
-    });
-    const resolver = new Resolver(moduleMap, {
-      resolver: require.resolve('../__mocks__/userResolver'),
-    });
-    const src = require.resolve('../');
-    resolver.getMockModule(src, 'dependentModule');
-
-    expect(userResolver).toHaveBeenCalled();
-    expect(userResolver.mock.calls[0][0]).toBe('dependentModule');
-    expect(userResolver.mock.calls[0][1]).toHaveProperty(
-      'basedir',
-      path.dirname(src),
-    );
-  });
 });
 
 describe('nodeModulesPaths', () => {

packages/jest-resolve/src/index.js

@@ -374,22 +374,6 @@ Please check:
         }
       }
     }
-    if (resolver) {
-      // if moduleNameMapper didn't match anything, fallback to just the
-      // regular resolver
-      const module =
-        this.getModule(moduleName) ||
-        Resolver.findNodeModule(moduleName, {
-          basedir: dirname,
-          browser: this._options.browser,
-          extensions,
-          moduleDirectory,
-          paths,
-          resolver,
-          rootDir: this._options.rootDir,
-        });
-      return module;
-    }
     return null;
   }