Fix moduleNameMapper not being able to use relative paths.

Reviewed By: dmitriiabramov

Differential Revision: D3111621

fb-gh-sync-id: 0bc993171d5008a63056b5ba04e2080aa53f23c0
fbshipit-source-id: 0bc993171d5008a63056b5ba04e2080aa53f23c0

Author: cpojer

src/HasteModuleLoader/HasteModuleLoader.js

@@ -468,10 +468,7 @@ class Loader {
       absolutePath = moduleName;
     } else {
       moduleType = 'user';
-      if (
-        constants.IS_PATH_BASED_MODULE_NAME.test(moduleName) ||
-        (!this._getModule(moduleName) && !this._getMockModule(moduleName))
-      ) {
+      if (!this._getModule(moduleName) && !this._getMockModule(moduleName)) {
         absolutePath = this._resolveModuleName(currPath, moduleName);
         // Look up if this module has an associated manual mock.
         const mockModule = this._getMockModule(moduleName);

src/HasteModuleLoader/__tests__/HasteModuleLoader-mock-test.js

@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @emails oncall+jsinfra
+ */
+'use strict';
+
+jest.disableAutomock();
+jest.mock('../../environments/JSDOMEnvironment');
+
+const path = require('path');
+const normalizeConfig = require('../../config/normalize');
+
+describe('HasteModuleLoader', () => {
+  let HasteModuleLoader;
+  let HasteResolver;
+  let JSDOMEnvironment;
+
+  const rootDir = path.join(__dirname, 'test_root');
+  const rootPath = path.join(rootDir, 'root.js');
+  const config = normalizeConfig({
+    cacheDirectory: global.CACHE_DIRECTORY,
+    name: 'HasteModuleLoader-mock-tests',
+    rootDir,
+  });
+
+  function buildLoader() {
+    const environment = new JSDOMEnvironment(config);
+    const resolver = new HasteResolver(config, {resetCache: false});
+    return resolver.getHasteMap().then(
+      response => resolver.end().then(() =>
+        new HasteModuleLoader(config, environment, response)
+      )
+    );
+  }
+
+  beforeEach(() => {
+    HasteModuleLoader = require('../HasteModuleLoader');
+    HasteResolver = require('../../resolvers/HasteResolver');
+    JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
+  });
+
+  describe('jest.mock', () => {
+    pit('uses uses explicitly set mocks instead of automocking', () => {
+      return buildLoader().then(loader => {
+        const mockReference = {isMock: true};
+        const root = loader.requireModule(rootPath, './root.js');
+        // Erase module registry because root.js requires most other modules.
+        root.jest.resetModuleRegistry();
+
+        root.jest.mock('RegularModule', () => mockReference);
+        root.jest.mock('ManuallyMocked', () => mockReference);
+
+        expect(
+          loader.requireModuleOrMock(rootPath, 'RegularModule')
+        ).toEqual(mockReference);
+
+        expect(
+          loader.requireModuleOrMock(rootPath, 'RegularModule')
+        ).toEqual(mockReference);
+      });
+    });
+  });
+
+  describe('jest.setMock', () => {
+    pit('uses uses explicitly set mocks instead of automocking', () => {
+      return buildLoader().then(loader => {
+        const mockReference = {isMock: true};
+        const root = loader.requireModule(rootPath, './root.js');
+        // Erase module registry because root.js requires most other modules.
+        root.jest.resetModuleRegistry();
+
+        root.jest.setMock('RegularModule', mockReference);
+        root.jest.setMock('ManuallyMocked', mockReference);
+
+        expect(
+          loader.requireModuleOrMock(rootPath, 'RegularModule')
+        ).toBe(mockReference);
+
+        expect(
+          loader.requireModuleOrMock(rootPath, 'RegularModule')
+        ).toBe(mockReference);
+      });
+    });
+  });
+});

src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModuleOrMock-test.js

@@ -121,7 +121,7 @@ describe('HasteModuleLoader', function() {
         exports = loader.requireModuleOrMock(rootPath, 'cat.png');
         expect(exports.isRelativeImageStub).toBe(true);
 
-        exports = loader.requireModuleOrMock(rootPath, 'dog.png');
+        exports = loader.requireModuleOrMock(rootPath, '../photos/dog.png');
         expect(exports.isRelativeImageStub).toBe(true);
 
         exports = loader.requireModuleOrMock(rootPath, 'module/name/test');

src/constants.js

@@ -16,4 +16,3 @@ const pkg = require('../package.json');
 exports.VERSION = pkg.version;
 exports.MAX_WORKERS = os.cpus().length;
 exports.NODE_MODULES = path.sep + 'node_modules' + path.sep;
-exports.IS_PATH_BASED_MODULE_NAME = /^(?:\.\.?\/|\/)/;