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

‎jest.config.base.js

Lines changed: 4 additions & 0 deletions
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+
};

‎jest.config.js

Lines changed: 18 additions & 0 deletions
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+
};

‎package.json

Lines changed: 2 additions & 19 deletions
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",

‎packages/abort-controller/jest.config.js

Lines changed: 5 additions & 0 deletions
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+
};

‎packages/abort-controller/package.json

Lines changed: 2 additions & 2 deletions
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
}

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

Lines changed: 5 additions & 0 deletions
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+
};

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

Lines changed: 2 additions & 2 deletions
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",

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

Lines changed: 5 additions & 0 deletions
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+
};

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

Lines changed: 2 additions & 2 deletions
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
}

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

Lines changed: 1 addition & 1 deletion
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,

0 commit comments

Comments
 (0)