fix(config): fixes a bug in path resolver

kulshekhar · Sep 6, 2018 · ceb0424 · ceb0424
1 parent 5c7eb5f
commit ceb0424
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/config/config-set.spec.ts b/src/config/config-set.spec.ts
@@ -33,7 +33,7 @@ function createConfigSet({
 } = {}) {
   const cs = new ConfigSet(fakers.jestConfig(jestConfig, tsJestConfig), parentConfig)
   if (resolve) {
-    jest.spyOn(cs, 'resolvePath').mockImplementation(resolve)
+    cs.resolvePath = resolve
   }
   return cs
 }
@@ -240,3 +240,13 @@ describe('typescript', () => {
     })
   })
 })
+
+describe('resolvePath', () => {
+  it('should resolve paths', () => {
+    const cs = createConfigSet({ jestConfig: { rootDir: '/root', cwd: '/cwd' } as any, resolve: null })
+    expect(normalizeSlashes(cs.resolvePath('bar.js', { throwIfMissing: false }))).toBe('/cwd/bar.js')
+    expect(normalizeSlashes(cs.resolvePath('./bar.js', { throwIfMissing: false }))).toBe('/cwd/bar.js')
+    expect(normalizeSlashes(cs.resolvePath('<rootDir>bar.js', { throwIfMissing: false }))).toBe('/root/bar.js')
+    expect(normalizeSlashes(cs.resolvePath('<rootDir>/bar.js', { throwIfMissing: false }))).toBe('/root/bar.js')
+  })
+})
diff --git a/src/config/config-set.ts b/src/config/config-set.ts
@@ -512,7 +512,7 @@ export class ConfigSet {
     let path: string = inputPath
     let nodeResolved = false
     if (path.startsWith('<rootDir>')) {
-      path = resolve(this.rootDir, path.substr(9))
+      path = resolve(join(this.rootDir, path.substr(9)))
     } else if (!isAbsolute(path)) {
       if (!path.startsWith('.') && nodeResolve) {
         try {