Skip to content

Commit 1e156ab

Browse files
trivikrtrivikr
authored
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
1 parent a27fa86 commit 1e156ab

File tree

280 files changed

+1411
-915
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+1411
-915
lines changed

Diff for: ‎jest.config.base.js

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
// remove testMatch once we move to ts-jest
3+
testMatch: ["**/__tests__/**/*.js?(x)", "**/?(*.)+(spec|test).js?(x)"]
4+
};

Diff for: ‎jest.config.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
const base = require("./jest.config.base.js");
2+
3+
module.exports = {
4+
...base,
5+
projects: ["<rootDir>/packages/*/jest.config.js"],
6+
testPathIgnorePatterns: [
7+
"<rootDir>/packages/add-glacier-checksum-headers-browser",
8+
"<rootDir>/packages/client-.*"
9+
],
10+
coveragePathIgnorePatterns: [
11+
"/node_modules/",
12+
"<rootDir>/packages/add-glacier-checksum-headers-browser",
13+
"<rootDir>/packages/crypto-sjcl-*",
14+
"<rootDir>/packages/xml-body-parser/vendor/",
15+
"<rootDir>/packages/client-.*",
16+
"/__fixtures__/"
17+
]
18+
};

Diff for: ‎package.json

+2-19
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
"devDependencies": {
2828
"@commitlint/cli": "^7.5.2",
2929
"@commitlint/config-conventional": "^7.5.0",
30+
"@types/jest": "^24.0.12",
3031
"generate-changelog": "^1.7.1",
3132
"husky": "^2.1.0",
32-
"jest": "^20.0.4",
33+
"jest": "^24.7.1",
3334
"lerna": "3.13.4",
3435
"lint-staged": "^8.1.5",
3536
"prettier": "1.17.0",
@@ -38,24 +39,6 @@
3839
"workspaces": [
3940
"packages/*"
4041
],
41-
"jest": {
42-
"mapCoverage": true,
43-
"projects": [
44-
"<rootDir>/packages/*"
45-
],
46-
"testPathIgnorePatterns": [
47-
"<rootDir>/packages/add-glacier-checksum-headers-browser",
48-
"<rootDir>/packages/client-.*"
49-
],
50-
"coveragePathIgnorePatterns": [
51-
"/node_modules/",
52-
"<rootDir>/packages/add-glacier-checksum-headers-browser",
53-
"<rootDir>/packages/crypto-sjcl-*",
54-
"<rootDir>/packages/xml-body-parser/vendor/",
55-
"<rootDir>/packages/client-.*",
56-
"/__fixtures__/"
57-
]
58-
},
5942
"husky": {
6043
"hooks": {
6144
"pre-commit": "lint-staged",

Diff for: ‎packages/abort-controller/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/abort-controller/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"tslib": "^1.8.0"
2121
},
2222
"devDependencies": {
23-
"@types/jest": "^20.0.2",
24-
"jest": "^20.0.4",
23+
"@types/jest": "^24.0.12",
24+
"jest": "^24.7.1",
2525
"typescript": "^3.0.0"
2626
}
2727
}

Diff for: ‎packages/add-glacier-checksum-headers-browser/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/add-glacier-checksum-headers-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"devDependencies": {
2727
"@aws-crypto/sha256-browser": "^0.1.0-preview.1",
2828
"@aws-sdk/util-utf8-browser": "^0.1.0-preview.1",
29-
"@types/jest": "^20.0.2",
29+
"@types/jest": "^24.0.12",
3030
"jasmine-core": "^2.8.0",
31-
"jest": "^20.0.4",
31+
"jest": "^24.7.1",
3232
"karma": "^2.0.0",
3333
"karma-chrome-launcher": "^2.2.0",
3434
"karma-jasmine": "^1.1.1",

Diff for: ‎packages/add-glacier-checksum-headers-node/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/add-glacier-checksum-headers-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"devDependencies": {
2626
"@aws-crypto/sha256-js": "^0.1.0-preview.1",
2727
"@aws-sdk/util-utf8-node": "^0.1.0-preview.1",
28-
"@types/jest": "^20.0.2",
28+
"@types/jest": "^24.0.12",
2929
"@types/node": "^8.10.29",
30-
"jest": "^20.0.4",
30+
"jest": "^24.7.1",
3131
"typescript": "^3.0.0"
3232
}
3333
}

Diff for: ‎packages/add-glacier-checksum-headers-node/src/index.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe("addChecksumHeaders", () => {
3030
hostname: "foo.us-east-1.amazonaws.com"
3131
};
3232

33-
const mockNextHandler = jest.fn(() => Promise.resolve());
33+
const mockNextHandler = jest.fn();
3434

3535
const composedHandler: BuildHandler<any, any, Readable> = addChecksumHeaders(
3636
Sha256,

Diff for: ‎packages/add-glacier-checksum-headers-universal/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/add-glacier-checksum-headers-universal/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"tslib": "^1.8.0"
2323
},
2424
"devDependencies": {
25-
"@types/jest": "^20.0.2",
25+
"@types/jest": "^24.0.12",
2626
"@types/node": "^8.10.29",
27-
"jest": "^20.0.4",
27+
"jest": "^24.7.1",
2828
"typescript": "^3.0.0"
2929
}
3030
}

Diff for: ‎packages/apply-body-checksum-middleware/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/apply-body-checksum-middleware/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"scripts": {
55
"prepublishOnly": "tsc",
66
"pretest": "tsc -p tsconfig.test.json",
7-
"test": "jest --coverage --mapCoverage"
7+
"test": "jest --coverage"
88
},
99
"main": "./build/index.js",
1010
"types": "./build/index.d.ts",
@@ -20,8 +20,8 @@
2020
"tslib": "^1.8.0"
2121
},
2222
"devDependencies": {
23-
"@types/jest": "^20.0.2",
24-
"jest": "^20.0.4",
23+
"@types/jest": "^24.0.12",
24+
"jest": "^24.7.1",
2525
"typescript": "^3.0.0"
2626
}
2727
}

Diff for: ‎packages/apply-body-checksum-middleware/src/index.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { applyBodyChecksumMiddleware } from "./";
22
import { HashConstructor, HttpRequest } from "@aws-sdk/types";
33

44
describe("applyChecksumMiddleware", () => {
5-
const mockEncoder = jest.fn(() => "encoded");
6-
const mockHashUpdate = jest.fn(() => {});
7-
const mockHashDigest = jest.fn(() => new Uint8Array(0));
5+
const mockEncoder = jest.fn().mockReturnValue("encoded");
6+
const mockHashUpdate = jest.fn();
7+
const mockHashDigest = jest.fn().mockReturnValue(new Uint8Array(0));
88
const MockHash: HashConstructor = class {} as any;
99
MockHash.prototype.update = mockHashUpdate;
1010
MockHash.prototype.digest = mockHashDigest;
1111

12-
const next = jest.fn(() => Promise.resolve({}));
12+
const next = jest.fn();
1313

1414
class ExoticStream {}
1515

Diff for: ‎packages/bucket-endpoint-middleware/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/bucket-endpoint-middleware/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"tslib": "^1.8.0"
2020
},
2121
"devDependencies": {
22-
"@types/jest": "^20.0.2",
23-
"jest": "^20.0.4",
22+
"@types/jest": "^24.0.12",
23+
"jest": "^24.7.1",
2424
"typescript": "^3.0.0"
2525
}
2626
}

Diff for: ‎packages/bucket-endpoint-middleware/src/bucketEndpointMiddleware.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe("bucketEndpointMiddleware", () => {
1313
hostname: "s3.us-west-2.amazonaws.com",
1414
path: "/bucket"
1515
};
16-
const next = jest.fn(() => Promise.resolve({}));
16+
const next = jest.fn();
1717

1818
beforeEach(() => {
1919
next.mockClear();

Diff for: ‎packages/build-types/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/chunked-blob-reader/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/chunked-blob-reader/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"tslib": "^1.8.0"
1919
},
2020
"devDependencies": {
21-
"@types/jest": "^20.0.2",
22-
"jest": "^20.0.4",
21+
"@types/jest": "^24.0.12",
22+
"jest": "^24.7.1",
2323
"typescript": "^3.0.0"
2424
}
2525
}

Diff for: ‎packages/chunked-stream-reader-node/jest.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const base = require("../../jest.config.base.js");
2+
3+
module.exports = {
4+
...base
5+
};

Diff for: ‎packages/chunked-stream-reader-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"tslib": "^1.8.0"
1919
},
2020
"devDependencies": {
21-
"@types/jest": "^20.0.2",
21+
"@types/jest": "^24.0.12",
2222
"@types/node": "^8.10.29",
23-
"jest": "^20.0.4",
23+
"jest": "^24.7.1",
2424
"typescript": "^3.0.0"
2525
}
2626
}

Diff for: ‎packages/client-codecommit-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
},
5252
"devDependencies": {
5353
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
54-
"@types/jest": "^20.0.2",
54+
"@types/jest": "^24.0.12",
5555
"@types/node": "^8.10.29",
56-
"jest": "^20.0.4",
56+
"jest": "^24.7.1",
5757
"rimraf": "^2.6.2",
5858
"typedoc": "^0.10.0",
5959
"typescript": "^3.0.0"

Diff for: ‎packages/client-documentation-generator/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"prepublishOnly": "tsc",
77
"pretest": "tsc",
8-
"test": "jest"
8+
"test": "exit 0"
99
},
1010
"main": "./build/index.js",
1111
"types": "./build/index.d.ts",
@@ -22,9 +22,9 @@
2222
"tslib": "^1.8.0"
2323
},
2424
"devDependencies": {
25-
"@types/jest": "^20.0.2",
25+
"@types/jest": "^24.0.12",
2626
"@types/node": "^8.10.29",
27-
"jest": "^20.0.4",
27+
"jest": "^24.7.1",
2828
"typedoc": "^0.10.0",
2929
"typescript": "^3.0.0"
3030
}

Diff for: ‎packages/client-dynamodb-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"devDependencies": {
5151
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
5252
"@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
53-
"@types/jest": "^20.0.2",
53+
"@types/jest": "^24.0.12",
5454
"jasmine-core": "^2.8.0",
55-
"jest": "^20.0.4",
55+
"jest": "^24.7.1",
5656
"karma": "^2.0.0",
5757
"karma-chrome-launcher": "^2.2.0",
5858
"karma-coverage": "^1.1.1",

Diff for: ‎packages/client-dynamodb-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
},
5252
"devDependencies": {
5353
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
54-
"@types/jest": "^20.0.2",
54+
"@types/jest": "^24.0.12",
5555
"@types/node": "^8.10.29",
56-
"jest": "^20.0.4",
56+
"jest": "^24.7.1",
5757
"rimraf": "^2.6.2",
5858
"typedoc": "^0.10.0",
5959
"typescript": "^3.0.0"

Diff for: ‎packages/client-glacier-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
},
5555
"devDependencies": {
5656
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
57-
"@types/jest": "^20.0.2",
57+
"@types/jest": "^24.0.12",
5858
"@types/node": "^8.10.29",
59-
"jest": "^20.0.4",
59+
"jest": "^24.7.1",
6060
"rimraf": "^2.6.2",
6161
"typedoc": "^0.10.0",
6262
"typescript": "^3.0.0"

Diff for: ‎packages/client-kinesis-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"devDependencies": {
5151
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
5252
"@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
53-
"@types/jest": "^20.0.2",
53+
"@types/jest": "^24.0.12",
5454
"jasmine-core": "^2.8.0",
55-
"jest": "^20.0.4",
55+
"jest": "^24.7.1",
5656
"karma": "^2.0.0",
5757
"karma-chrome-launcher": "^2.2.0",
5858
"karma-coverage": "^1.1.1",

Diff for: ‎packages/client-kms-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"devDependencies": {
5151
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
5252
"@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
53-
"@types/jest": "^20.0.2",
53+
"@types/jest": "^24.0.12",
5454
"jasmine-core": "^2.8.0",
55-
"jest": "^20.0.4",
55+
"jest": "^24.7.1",
5656
"karma": "^2.0.0",
5757
"karma-chrome-launcher": "^2.2.0",
5858
"karma-coverage": "^1.1.1",

Diff for: ‎packages/client-kms-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
},
5252
"devDependencies": {
5353
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
54-
"@types/jest": "^20.0.2",
54+
"@types/jest": "^24.0.12",
5555
"@types/node": "^8.10.29",
56-
"jest": "^20.0.4",
56+
"jest": "^24.7.1",
5757
"rimraf": "^2.6.2",
5858
"typedoc": "^0.10.0",
5959
"typescript": "^3.0.0"

Diff for: ‎packages/client-lambda-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
},
5252
"devDependencies": {
5353
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
54-
"@types/jest": "^20.0.2",
54+
"@types/jest": "^24.0.12",
5555
"@types/node": "^8.10.29",
56-
"jest": "^20.0.4",
56+
"jest": "^24.7.1",
5757
"rimraf": "^2.6.2",
5858
"typedoc": "^0.10.0",
5959
"typescript": "^3.0.0"

Diff for: ‎packages/client-pinpoint-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"devDependencies": {
5151
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
5252
"@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
53-
"@types/jest": "^20.0.2",
53+
"@types/jest": "^24.0.12",
5454
"jasmine-core": "^2.8.0",
55-
"jest": "^20.0.4",
55+
"jest": "^24.7.1",
5656
"karma": "^2.0.0",
5757
"karma-chrome-launcher": "^2.2.0",
5858
"karma-coverage": "^1.1.1",

Diff for: ‎packages/client-s3-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"devDependencies": {
5757
"@aws-sdk/client-documentation-generator": "^0.1.0-preview.1",
5858
"@aws-sdk/karma-credential-loader": "^0.1.0-preview.4",
59-
"@types/jest": "^20.0.2",
59+
"@types/jest": "^24.0.12",
6060
"jasmine-core": "^2.8.0",
61-
"jest": "^20.0.4",
61+
"jest": "^24.7.1",
6262
"karma": "^2.0.0",
6363
"karma-chrome-launcher": "^2.2.0",
6464
"karma-coverage": "^1.1.1",

0 commit comments

Comments
 (0)