feat: update jest v20 to v24 (#243)

* feat: update jest v20 to v24 * chore: jest.fn().mockReturnValue(null) -> jest.fn() * chore: add jest.config.base.js which is read from all packages * fix: fix local storage test
aws · May 9, 2019 · 1e156ab · 1e156ab
1 parent a27fa86
commit 1e156ab
Show file tree

Hide file tree

Showing 280 changed files with 1,411 additions and 915 deletions.
diff --git a/jest.config.base.js b/jest.config.base.js
@@ -0,0 +1,4 @@
+module.exports = {
+  // remove testMatch once we move to ts-jest
+  testMatch: ["**/__tests__/**/*.js?(x)", "**/?(*.)+(spec|test).js?(x)"]
+};
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,18 @@
+const base = require("./jest.config.base.js");
+
+module.exports = {
+  ...base,
+  projects: ["<rootDir>/packages/*/jest.config.js"],
+  testPathIgnorePatterns: [
+    "<rootDir>/packages/add-glacier-checksum-headers-browser",
+    "<rootDir>/packages/client-.*"
+  ],
+  coveragePathIgnorePatterns: [
+    "/node_modules/",
+    "<rootDir>/packages/add-glacier-checksum-headers-browser",
+    "<rootDir>/packages/crypto-sjcl-*",
+    "<rootDir>/packages/xml-body-parser/vendor/",
+    "<rootDir>/packages/client-.*",
+    "/__fixtures__/"
+  ]
+};
diff --git a/package.json b/package.json
@@ -27,9 +27,10 @@
   "devDependencies": {
     "@commitlint/cli": "^7.5.2",
     "@commitlint/config-conventional": "^7.5.0",
+    "@types/jest": "^24.0.12",
     "generate-changelog": "^1.7.1",
     "husky": "^2.1.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "lerna": "3.13.4",
     "lint-staged": "^8.1.5",
     "prettier": "1.17.0",
@@ -38,24 +39,6 @@
   "workspaces": [
     "packages/*"
   ],
-  "jest": {
-    "mapCoverage": true,
-    "projects": [
-      "<rootDir>/packages/*"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/packages/add-glacier-checksum-headers-browser",
-      "<rootDir>/packages/client-.*"
-    ],
-    "coveragePathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/packages/add-glacier-checksum-headers-browser",
-      "<rootDir>/packages/crypto-sjcl-*",
-      "<rootDir>/packages/xml-body-parser/vendor/",
-      "<rootDir>/packages/client-.*",
-      "/__fixtures__/"
-    ]
-  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",

diff --git a/packages/abort-controller/jest.config.js b/packages/abort-controller/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/abort-controller/package.json b/packages/abort-controller/package.json
@@ -20,8 +20,8 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
-    "jest": "^20.0.4",
+    "@types/jest": "^24.0.12",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/add-glacier-checksum-headers-browser/jest.config.js b/packages/add-glacier-checksum-headers-browser/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/add-glacier-checksum-headers-browser/package.json b/packages/add-glacier-checksum-headers-browser/package.json
@@ -26,9 +26,9 @@
   "devDependencies": {
     "@aws-crypto/sha256-browser": "^0.1.0-preview.1",
     "@aws-sdk/util-utf8-browser": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "jasmine-core": "^2.8.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.1.1",

diff --git a/packages/add-glacier-checksum-headers-node/jest.config.js b/packages/add-glacier-checksum-headers-node/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/add-glacier-checksum-headers-node/package.json b/packages/add-glacier-checksum-headers-node/package.json
@@ -25,9 +25,9 @@
   "devDependencies": {
     "@aws-crypto/sha256-js": "^0.1.0-preview.1",
     "@aws-sdk/util-utf8-node": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/add-glacier-checksum-headers-node/src/index.spec.ts b/packages/add-glacier-checksum-headers-node/src/index.spec.ts
@@ -30,7 +30,7 @@ describe("addChecksumHeaders", () => {
     hostname: "foo.us-east-1.amazonaws.com"
   };
 
-  const mockNextHandler = jest.fn(() => Promise.resolve());
+  const mockNextHandler = jest.fn();
 
   const composedHandler: BuildHandler<any, any, Readable> = addChecksumHeaders(
     Sha256,

diff --git a/packages/add-glacier-checksum-headers-universal/jest.config.js b/packages/add-glacier-checksum-headers-universal/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/add-glacier-checksum-headers-universal/package.json b/packages/add-glacier-checksum-headers-universal/package.json
@@ -22,9 +22,9 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/apply-body-checksum-middleware/jest.config.js b/packages/apply-body-checksum-middleware/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/apply-body-checksum-middleware/package.json b/packages/apply-body-checksum-middleware/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "prepublishOnly": "tsc",
     "pretest": "tsc -p tsconfig.test.json",
-    "test": "jest --coverage --mapCoverage"
+    "test": "jest --coverage"
   },
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -20,8 +20,8 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
-    "jest": "^20.0.4",
+    "@types/jest": "^24.0.12",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/apply-body-checksum-middleware/src/index.spec.ts b/packages/apply-body-checksum-middleware/src/index.spec.ts
@@ -2,14 +2,14 @@ import { applyBodyChecksumMiddleware } from "./";
 import { HashConstructor, HttpRequest } from "@aws-sdk/types";
 
 describe("applyChecksumMiddleware", () => {
-  const mockEncoder = jest.fn(() => "encoded");
-  const mockHashUpdate = jest.fn(() => {});
-  const mockHashDigest = jest.fn(() => new Uint8Array(0));
+  const mockEncoder = jest.fn().mockReturnValue("encoded");
+  const mockHashUpdate = jest.fn();
+  const mockHashDigest = jest.fn().mockReturnValue(new Uint8Array(0));
   const MockHash: HashConstructor = class {} as any;
   MockHash.prototype.update = mockHashUpdate;
   MockHash.prototype.digest = mockHashDigest;
 
-  const next = jest.fn(() => Promise.resolve({}));
+  const next = jest.fn();
 
   class ExoticStream {}
 

diff --git a/packages/bucket-endpoint-middleware/jest.config.js b/packages/bucket-endpoint-middleware/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/bucket-endpoint-middleware/package.json b/packages/bucket-endpoint-middleware/package.json
@@ -19,8 +19,8 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
-    "jest": "^20.0.4",
+    "@types/jest": "^24.0.12",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.spec.ts b/packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.spec.ts
@@ -13,7 +13,7 @@ describe("bucketEndpointMiddleware", () => {
     hostname: "s3.us-west-2.amazonaws.com",
     path: "/bucket"
   };
-  const next = jest.fn(() => Promise.resolve({}));
+  const next = jest.fn();
 
   beforeEach(() => {
     next.mockClear();

diff --git a/packages/build-types/jest.config.js b/packages/build-types/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/chunked-blob-reader/jest.config.js b/packages/chunked-blob-reader/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/chunked-blob-reader/package.json b/packages/chunked-blob-reader/package.json
@@ -18,8 +18,8 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
-    "jest": "^20.0.4",
+    "@types/jest": "^24.0.12",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/chunked-stream-reader-node/jest.config.js b/packages/chunked-stream-reader-node/jest.config.js
@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base.js");
+
+module.exports = {
+  ...base
+};
diff --git a/packages/chunked-stream-reader-node/package.json b/packages/chunked-stream-reader-node/package.json
@@ -18,9 +18,9 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "typescript": "^3.0.0"
   }
 }
diff --git a/packages/client-codecommit-node/package.json b/packages/client-codecommit-node/package.json
@@ -51,9 +51,9 @@
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "rimraf": "^2.6.2",
     "typedoc": "^0.10.0",
     "typescript": "^3.0.0"

diff --git a/packages/client-documentation-generator/package.json b/packages/client-documentation-generator/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "prepublishOnly": "tsc",
     "pretest": "tsc",
-    "test": "jest"
+    "test": "exit 0"
   },
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -22,9 +22,9 @@
     "tslib": "^1.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "typedoc": "^0.10.0",
     "typescript": "^3.0.0"
   }

diff --git a/packages/client-dynamodb-browser/package.json b/packages/client-dynamodb-browser/package.json
@@ -50,9 +50,9 @@
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
     "@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "jasmine-core": "^2.8.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",

diff --git a/packages/client-dynamodb-node/package.json b/packages/client-dynamodb-node/package.json
@@ -51,9 +51,9 @@
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "rimraf": "^2.6.2",
     "typedoc": "^0.10.0",
     "typescript": "^3.0.0"

diff --git a/packages/client-glacier-node/package.json b/packages/client-glacier-node/package.json
@@ -54,9 +54,9 @@
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "rimraf": "^2.6.2",
     "typedoc": "^0.10.0",
     "typescript": "^3.0.0"

diff --git a/packages/client-kinesis-browser/package.json b/packages/client-kinesis-browser/package.json
@@ -50,9 +50,9 @@
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
     "@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "jasmine-core": "^2.8.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",

diff --git a/packages/client-kms-browser/package.json b/packages/client-kms-browser/package.json
@@ -50,9 +50,9 @@
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
     "@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "jasmine-core": "^2.8.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",

diff --git a/packages/client-kms-node/package.json b/packages/client-kms-node/package.json
@@ -51,9 +51,9 @@
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "rimraf": "^2.6.2",
     "typedoc": "^0.10.0",
     "typescript": "^3.0.0"

diff --git a/packages/client-lambda-node/package.json b/packages/client-lambda-node/package.json
@@ -51,9 +51,9 @@
   },
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "@types/node": "^8.10.29",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "rimraf": "^2.6.2",
     "typedoc": "^0.10.0",
     "typescript": "^3.0.0"

diff --git a/packages/client-pinpoint-browser/package.json b/packages/client-pinpoint-browser/package.json
@@ -50,9 +50,9 @@
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
     "@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "jasmine-core": "^2.8.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",

diff --git a/packages/client-s3-browser/package.json b/packages/client-s3-browser/package.json
@@ -56,9 +56,9 @@
   "devDependencies": {
     "@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
     "@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
-    "@types/jest": "^20.0.2",
+    "@types/jest": "^24.0.12",
     "jasmine-core": "^2.8.0",
-    "jest": "^20.0.4",
+    "jest": "^24.7.1",
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",