Merge pull request #81 from palmerj3/upgradeJest

Upgrade jest, jest-config, jest-validate to 24

.gitignore

@@ -1,3 +1,2 @@
 node_modules
-yarn.lock
 junit.xml

.travis.yml

@@ -7,5 +7,6 @@ node_js:
 env:
   - JEST_VERSION=^22.0.0
   - JEST_VERSION=^23.0.0
+  - JEST_VERSION=^24.0.0
 script:
   - npm run test:ci

package.json

@@ -16,18 +16,17 @@
   ],
   "scripts": {
     "test": "jest",
-    "pretest:ci": "npm install jest@$JEST_VERSION --no-save",
+    "pretest:ci": "npm uninstall jest babel-jest && npm install jest@$JEST_VERSION",
     "test:ci": "jest --ci"
   },
   "dependencies": {
-    "jest-config": "^23.6.0",
-    "jest-validate": "^23.0.1",
+    "jest-validate": "^24.0.0",
     "mkdirp": "^0.5.1",
     "strip-ansi": "^4.0.0",
     "xml": "^1.0.1"
   },
   "devDependencies": {
-    "jest": "^22.4.3",
+    "jest": "^24.0.0",
     "libxmljs": "^0.18.4"
   }
 }

utils/getOptions.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 
 const constants = require('../constants/index');
 
-const { replaceRootDirInPath } = require('jest-config');
+const { replaceRootDirInPath } = require('./replaceRootDirInPath');
 
 function getEnvOptions() {
   const options = {};

utils/replaceRootDirInPath.js

@@ -0,0 +1,20 @@
+// Copied from https://github.com/facebook/jest/blob/master/packages/jest-config/src/utils.js
+// in order to reduce incompatible jest dependencies
+
+const path = require('path');
+
+module.exports = {
+  replaceRootDirInPath : (
+    rootDir,
+    filePath,
+  ) => {
+    if (!/^<rootDir>/.test(filePath)) {
+      return filePath;
+    }
+
+    return path.resolve(
+      rootDir,
+      path.normalize('./' + filePath.substr('<rootDir>'.length)),
+    );
+  }
+}