Merge pull request kulshekhar#344 from misantronic/master

fix: add startDir to if-clause Closes kulshekhar#343
sihu · Oct 10, 2017 · 7b15180 · 7b15180
2 parents d33d311 + 4d32d51
commit 7b15180
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -13,6 +13,7 @@ Chris Sauve <chrismsauve@gmail.com>
 Christian Linne <ShadowVampire@web.de>
 Christian Rackerseder <git@echooff.de>
 Daniel Perez Alvarez <unindented@gmail.com>
+David Schkalee <david.schkalee@magicline.de>
 David Sheldrick <djsheldrick@gmail.com>
 Emil Persson <emil.n.persson@gmail.com>
 Eric Anderson <e@ericlanderson.com>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "21.1.1",
+  "version": "21.1.2",
   "main": "index.js",
   "types": "./dist/index.d.ts",
   "description": "A preprocessor with sourcemap support to help use Typescript with Jest",

diff --git a/src/utils.ts b/src/utils.ts
@@ -204,7 +204,7 @@ export function getTSConfig(globals, collectCoverage: boolean = false) {
 
     config = readCompilerOptions(configPath);
 
-    if (configFileName === 'tsconfig.json') {
+    if (configFileName === path.join(getStartDir(), 'tsconfig.json')) {
       // hardcode module to 'commonjs' in case the config is being loaded
       // from the default tsconfig file. This is to ensure that coverage
       // works well. If there's a need to override, it can be done using