update jest

microsoft · Mar 12, 2019 · ce9418e · ce9418e
1 parent 1e98bfe
commit ce9418e
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 91 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 aliases:
     - &container_config
         docker:
-            - image: "circleci/node:11.10.0"
+            - image: "circleci/node:latest"
         working_directory: ~/fast-dna
 
     - &node_install

diff --git a/package.json b/package.json
@@ -79,25 +79,25 @@
   },
   "devDependencies": {
     "@microsoft/fast-tslint-rules": "^3.0.0",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.7",
     "babel-core": "^6.26.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "babel-preset-env": "^1.6.1",
     "chalk": "^2.4.2",
     "docusaurus-init": "^1.0.2",
     "dotenv": "^6.0.0",
     "eyes.selenium": "3.6.2",
     "glob": "^7.1.2",
     "husky": "^1.1.2",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "lerna": "3.11.1",
     "lint-staged": "^7.3.0",
     "markdown-it": "^8.4.1",
     "prettier": "1.14.3",
     "rimraf": "^2.6.2",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-node": "^5.0.1",
     "tslint": "^5.9.1",
     "typedoc": "^0.14.2",

diff --git a/packages/fast-animation/package.json b/packages/fast-animation/package.json
@@ -34,7 +34,7 @@
       "global": {
         "statements": 72,
         "branches": 57,
-        "functions": 68,
+        "functions": 67,
         "lines": 72
       }
     },
@@ -58,7 +58,7 @@
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/node": "^7.0.22",
     "@types/react": "^15.0.24",
     "@types/react-dom": "^15.5.0",
@@ -70,7 +70,7 @@
     "file-loader": "^3.0.1",
     "fork-ts-checker-webpack-plugin": "^0.4.0",
     "html-webpack-plugin": "^3.2.0",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "lodash-es": "^4.0.0",
     "mini-css-extract-plugin": "^0.5.0",
     "modernizr-webpack-plugin": "^1.0.5",
@@ -82,7 +82,7 @@
     "react-router": "^4.1.1",
     "require-dir": "^0.3.2",
     "style-loader": "^0.13.2",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "tslint": "^5.3.2",
     "tslint-config-prettier": "^1.15.0",
     "tslint-loader": "^3.5.3",

diff --git a/packages/fast-application-utilities/package.json b/packages/fast-application-utilities/package.json
@@ -33,10 +33,10 @@
     "collectCoverage": true,
     "coverageThreshold": {
       "global": {
-        "statements": 87,
+        "statements": 85,
         "branches": 75,
         "functions": 100,
-        "lines": 87
+        "lines": 85
       }
     },
     "testURL": "http://localhost",
@@ -63,14 +63,14 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
-    "jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
+    "jest": "^24.5.0",
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.0.1",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-breakpoint-tracker-react/package.json b/packages/fast-breakpoint-tracker-react/package.json
@@ -59,12 +59,12 @@
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.0.0",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.6",
     "@types/react": "^16.4.18",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "exenv-es6": "^1.0.0",
@@ -74,7 +74,7 @@
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "react-test-renderer": "^16.2.0",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",
     "typescript": "^3.0.1",

diff --git a/packages/fast-colors/package.json b/packages/fast-colors/package.json
@@ -56,12 +56,12 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "babel-core": "^7.0.0-bridge.0",
     "chroma-js": "^1.3.0",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "prettier": "1.14.3",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",
     "typescript": "^3.0.1"

diff --git a/packages/fast-components-foundation-react/package.json b/packages/fast-components-foundation-react/package.json
@@ -61,23 +61,23 @@
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.6",
     "@types/react": "^16.4.18",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "exenv-es6": "^1.0.0",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "jsdom-global": "^3.0.2",
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "react-test-renderer": "^16.3.0",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.0.1",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-components-react-base/package.json b/packages/fast-components-react-base/package.json
@@ -76,18 +76,18 @@
     "@microsoft/fast-tslint-rules": "^3.0.2",
     "@microsoft/fast-web-utilities": "^3.1.2",
     "@types/enzyme": "^3.1.15",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.6",
     "@types/react": "^16.3.6",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "exenv-es6": "^1.0.0",
     "glob": "^7.1.2",
     "html-webpack-plugin": "^3.0.4",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "jsdom-global": "^3.0.2",
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
@@ -98,7 +98,7 @@
     "react-test-renderer": "^16.3.0",
     "regenerator-runtime": "^0.11.1",
     "rimraf": "^2.6.2",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.0.1",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-components-react-msft/package.json b/packages/fast-components-react-msft/package.json
@@ -81,12 +81,12 @@
     "@microsoft/fast-jss-manager": "^3.0.12",
     "@microsoft/fast-sketch-library": "^3.0.5",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.6",
     "@types/react": "^16.4.18",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "exenv-es6": "^1.0.0",
@@ -95,13 +95,13 @@
     "file-loader": "^1.1.11",
     "focus-visible": "^4.1.5",
     "html-webpack-plugin": "^3.0.4",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "rimraf": "^2.6.2",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.0.1",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-css-editor-react/package.json b/packages/fast-css-editor-react/package.json
@@ -79,22 +79,22 @@
     "@microsoft/fast-jss-utilities": "^3.2.4",
     "@microsoft/fast-sketch-library": "^3.0.5",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.6",
     "@types/react": "^16.4.18",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
     "html-webpack-plugin": "^3.0.4",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
     "react-test-renderer": "^16.6.3",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.0.1",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-data-utilities-react/package.json b/packages/fast-data-utilities-react/package.json
@@ -63,18 +63,18 @@
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.6.7",
     "@types/react": "^16.3.6",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
-    "jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
+    "jest": "^24.5.0",
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
     "react": "^16.3.0",
     "rimraf": "^2.6.2",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",
     "tslint-react": "^3.5.1",

diff --git a/packages/fast-form-generator-react/package.json b/packages/fast-form-generator-react/package.json
@@ -82,19 +82,19 @@
     "@microsoft/fast-permutator": "^2.2.6",
     "@microsoft/fast-tslint-rules": "^3.0.2",
     "@types/enzyme": "^3.1.15",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.6.2",
     "@types/react": "^16.4.18",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
     "exenv-es6": "^1.0.0",
     "fork-ts-checker-webpack-plugin": "^0.4.1",
     "glob": "^7.1.2",
     "html-webpack-plugin": "^3.2.0",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "lodash-es": "^4.0.0",
     "mkdirp": "^0.5.1",
     "path": "^0.12.7",
@@ -103,7 +103,7 @@
     "react-dom": "^16.6.0",
     "react-redux": "^5.0.7",
     "react-sortable-hoc": "^0.6.8",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.2.0",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-jest-snapshots-react/package.json b/packages/fast-jest-snapshots-react/package.json
@@ -53,12 +53,12 @@
   },
   "devDependencies": {
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^23.3.5",
+    "@types/jest": "^24.0.11",
     "@types/react": "^16.4.18",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "prettier": "1.14.3",
     "react": "^16.6.0",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^24.0.0",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",
     "typescript": "^3.0.1"
@@ -68,7 +68,7 @@
     "react-test-renderer": "^16.3.0"
   },
   "peerDependencies": {
-    "jest": "^22.0.0 || ^23.0.0",
+    "jest": "^22.0.0 || ^23.0.0 || ^24.0.0",
     "react": "^16.6.0"
   }
 }
diff --git a/packages/fast-jss-manager-angular/package.json b/packages/fast-jss-manager-angular/package.json
@@ -37,7 +37,7 @@
     "coverageThreshold": {
       "global": {
         "statements": 41,
-        "branches": 6,
+        "branches": 0,
         "functions": 20,
         "lines": 40
       }
@@ -69,10 +69,10 @@
     "@angular/platform-browser-dynamic": "^5.2.9",
     "@babel/preset-env": "^7.1.0",
     "@microsoft/fast-tslint-rules": "^3.0.2",
-    "@types/jest": "^22.1.2",
+    "@types/jest": "^24.0.11",
     "@types/lodash-es": "^4.17.0",
     "@types/node": "^9.4.6",
-    "babel-jest": "^22.4.3",
+    "babel-jest": "^24.5.0",
     "core-js": "^2.4.1",
     "fork-ts-checker-webpack-plugin": "^0.4.2",
     "html-webpack-plugin": "^3.2.0",
@@ -83,7 +83,7 @@
     "lodash-es": "^4.0.0",
     "prettier": "1.14.3",
     "rxjs": "^5.5.6",
-    "ts-jest": "^22.0.4",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.4.1",
     "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",

diff --git a/packages/fast-jss-manager-angular/src/jss.ts → ...t-jss-manager-angular/src/jss-instance.ts b/packages/fast-jss-manager-angular/src/jss.ts → ...t-jss-manager-angular/src/jss-instance.ts
diff --git a/packages/fast-jss-manager-angular/src/manage-jss.ts b/packages/fast-jss-manager-angular/src/manage-jss.ts
@@ -1,8 +1,8 @@
 import { Component, ElementRef, Input, SimpleChanges } from "@angular/core";
-import { SheetsManager, StyleSheet } from "jss";
+import { SheetsManager } from "jss";
 import { ComponentStyles } from "@microsoft/fast-jss-manager";
 import { eventNames } from "./utilities/get-event-names";
-import jss, { stylesheetManager } from "./jss";
+import jss, { stylesheetManager } from "./jss-instance";
 
 /**
  * State interface for JSS manager

diff --git a/packages/fast-jss-manager-angular/src/tsconfig.spec.json b/packages/fast-jss-manager-angular/src/tsconfig.spec.json
@@ -10,9 +10,7 @@
     ]
   },
   "include": [
-    "**/*.spec.ts",
-    "**/*.test.ts",
-    "**/*.d.ts"
+      "./src/**/*"
   ],
   "exclude": [
       "**/dist/**"