Update jest to v24 #31825

mshustov · 2019-02-22T17:56:11Z

Summary

Update to v24

jest
jest-cli
@types/jest

Checklist

Use ~~strikethroughs~~ to remove checklist items you don't feel are applicable to this PR.

~~[ ] This was checked for cross-browser compatibility, including a check against IE11~~
~~[ ] Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support~~
~~[ ] Documentation was added for features that require explanation or tutorials~~
Unit or functional tests were updated or added to match the most common scenarios
~~[ ] This was checked for keyboard-only and screenreader accessibility~~

For maintainers

This was checked for breaking API changes and was labeled appropriately
This includes a feature addition or change that requires a release note and was labeled appropriately

elasticmachine · 2019-02-22T18:39:14Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

epixa · 2019-02-22T19:08:06Z

There's also jest inside x-pack/package.json that we'll need to update as well. I assume that's why the lock file changes had so many additions but none of the existing jest stuff was removed or changed.

Mock interface doesn't match CallCluster. Requires additional work

mshustov · 2019-02-24T15:18:21Z

x-pack/plugins/canvas/server/routes/workpad.test.js

  ],
-  "results": Array [


it doesn't make sense to test jest internals, so I removed part of snapshot test (yes, it had a conflict with new jest version)

mshustov · 2019-02-24T15:19:22Z

x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts

@@ -22,7 +22,7 @@ import { LOCK_WINDOW, ReindexActions, reindexActionsFactory } from './reindex_ac

 describe('ReindexActions', () => {
  let client: jest.Mocked<any>;
-  let callCluster: jest.Mock<CallCluster>;
+  let callCluster: jest.Mock;


had to delete declaration as mock doesn't implement full CallCluster contract

Sounds good, I'll fix this up to be complete after this is merged (I wrote this).

mshustov · 2019-02-24T15:37:53Z

x-pack/package.json

@@ -46,7 +46,7 @@
    "@types/expect.js": "^0.3.29",
    "@types/graphql": "^0.13.1",
    "@types/history": "^4.6.2",
-    "@types/jest": "^23.3.1",
+    "@types/jest": "^24.0.6",


@epixa why we need to have another package.json for x-pack?

mshustov · 2019-02-24T15:38:57Z

x-pack/package.json

@@ -202,6 +203,8 @@
    "inline-style": "^2.0.0",
    "intl": "^1.2.5",
    "io-ts": "^1.4.2",
+    "jest": "^24.1.0",


why packages are duplicated in "devDependencies" and "dependencies"?

Probably a mistake. I would be surprised if we wanted to ship jest in the production build to users.

Sometimes it happens. Contentful did it to run their functional tests 😅

elasticmachine · 2019-02-24T16:07:27Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2019-02-24T18:19:44Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

elasticmachine · 2019-02-24T18:23:04Z

Pinging @elastic/kibana-platform

sorenlouv

LGTM from APM. Thanks for updating Jest!

joshdover

A few notes, mostly about the tests themselves rather than your changes. Figured now is a good time to fix some of these issues since their aren't too many, but I'll leave some of the trickier cases at your discretion on whether or not they're worth fixing right now.

src/core/public/fatal_errors/fatal_errors_service.test.ts

joshdover · 2019-02-25T16:39:33Z

src/core/public/ui_settings/__snapshots__/ui_settings_service.test.ts.snap

@@ -12,7 +12,7 @@ exports[`#start constructs UiSettingsClient and UiSettingsApi: UiSettingsApi arg
  ],
  "results": Array [
    Object {
-      "isThrow": false,
+      "type": "return",


These snapshots look like they're testing more jest internals rather than just the call arguments themselves. Can we fix these too?

Mocked functions are inside JS objects that serialised for snapshot testing. I didn't find a cheap way to fix it and decided to keep it as is.
As an alternative solution, we can define custom serialiser for mocked functions https://jestjs.io/docs/en/configuration#snapshotserializers-array-string

Perfectly good reason.

joshdover · 2019-02-25T16:41:25Z

src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap

@@ -37,7 +37,7 @@ Array [
          ],
          "results": Array [
            Object {
-              "isThrow": false,
+              "type": "return",


Jest internals here as well, though this may be a bit hard to fix since it's an entire object. I'm not sure why we're testing such large snapshots like this though.

joshdover · 2019-02-25T16:45:36Z

src/core/server/logging/logger.test.ts

@@ -27,7 +27,7 @@ let appenderMocks: Appender[];
 let logger: BaseLogger;

 const timestamp = new Date(2012, 1, 1);
-jest.spyOn(global, 'Date').mockImplementation(() => timestamp);
+jest.spyOn<any, any>(global, 'Date').mockImplementation(() => timestamp);


This spy doesn't ever seem to be restored with mockRestore. We should make sure that happens explicitly after these tests run since we don't have the restoreMocks config option set to true.

As an aside: it'd be awesome if there was linter rule we could add for this.

👍 will fix. don't know why but I was sure we use restoreMocks: true

joshdover · 2019-02-25T16:46:11Z

src/core/server/logging/logging_service.test.ts

@@ -27,10 +27,10 @@ const timestamp = new Date(Date.UTC(2012, 1, 1));
 const mockConsoleLog = jest.spyOn(global.console, 'log').mockImplementation(() => {
  // noop
 });
-jest.spyOn(global, 'Date').mockImplementation(() => timestamp);
+jest.spyOn<any, any>(global, 'Date').mockImplementation(() => timestamp);


Same as above about mockRestore

joshdover · 2019-02-25T16:47:46Z

x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts

@@ -22,7 +22,7 @@ import { LOCK_WINDOW, ReindexActions, reindexActionsFactory } from './reindex_ac

 describe('ReindexActions', () => {
  let client: jest.Mocked<any>;
-  let callCluster: jest.Mock<CallCluster>;
+  let callCluster: jest.Mock;


Sounds good, I'll fix this up to be complete after this is merged (I wrote this).

joshdover · 2019-02-25T16:48:32Z

src/core/server/root/index.test.ts

-});
+const mockProcessExit = jest
+  .spyOn(global.process, 'exit')
+  .mockImplementation(() => undefined as never);


Also missing a restore.

azasypkin

LGTM

azasypkin · 2019-02-28T08:38:04Z

package.json

@@ -281,7 +281,7 @@
    "@types/has-ansi": "^3.0.0",


question: how about updating babel-jest to 24.1.0 here and in x-pack?

babel-jest@v24 uses babel@v7 which require @kbn/babel-preset/node_preset update. seems like quite a bit task

will be done in #32326

azasypkin · 2019-02-28T08:46:42Z

x-pack/package.json

@@ -202,6 +202,7 @@
    "inline-style": "^2.0.0",
    "intl": "^1.2.5",
    "io-ts": "^1.4.2",
+    "jest-cli": "^24.1.0",


question/issue: why do we need jest-cli in non-dev dependencies?

seems like a mistake when updated version via yarn cli. will fix now

elasticmachine · 2019-02-28T12:22:26Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

* udpate jest, jest-cli, @types/jest to v24 * fix type error in kibana-i18n package * return serivce explicitly to fix typings * add explicit never * suppress typings errors * update jest versions in x-pack * make tests in x-pack more robust and fix incompatibility * suppress CallCluster mock typings Mock interface doesn't match CallCluster. Requires additional work * x-pack. resolve other typing conflicts * remove unused types/jest * fix snapshots * restore mocks after jest.spyOn * remove outdated definitions for jest * cleanup x-pack package.json and update @types/jest * fix tests merged from master * updated yarn.lock and log errors for scripts/type_check * This commit fixes error in TS, which failed on parsing the file. * suppress type errors from master * jest-cli is devDep

* udpate jest, jest-cli, @types/jest to v24 * fix type error in kibana-i18n package * return serivce explicitly to fix typings * add explicit never * suppress typings errors * update jest versions in x-pack * make tests in x-pack more robust and fix incompatibility * suppress CallCluster mock typings Mock interface doesn't match CallCluster. Requires additional work * x-pack. resolve other typing conflicts * remove unused types/jest * fix snapshots * restore mocks after jest.spyOn * remove outdated definitions for jest * cleanup x-pack package.json and update @types/jest * fix tests merged from master * updated yarn.lock and log errors for scripts/type_check * This commit fixes error in TS, which failed on parsing the file. * suppress type errors from master * jest-cli is devDep Removes sinon from saved objects unit tests. (elastic#32045) (elastic#32151) * Removes sinon from saved objects unit tests. * Uses mockResolvedValue for return values as promises. temp

* udpate jest, jest-cli, @types/jest to v24 * fix type error in kibana-i18n package * return serivce explicitly to fix typings * add explicit never * suppress typings errors * update jest versions in x-pack * make tests in x-pack more robust and fix incompatibility * suppress CallCluster mock typings Mock interface doesn't match CallCluster. Requires additional work * x-pack. resolve other typing conflicts * remove unused types/jest * fix snapshots * restore mocks after jest.spyOn * remove outdated definitions for jest * cleanup x-pack package.json and update @types/jest * fix tests merged from master * updated yarn.lock and log errors for scripts/type_check * This commit fixes error in TS, which failed on parsing the file. * suppress type errors from master * jest-cli is devDep Removes sinon from saved objects unit tests. (#32045) (#32151) * Removes sinon from saved objects unit tests. * Uses mockResolvedValue for return values as promises. temp

* Update jest to v24 (#31825) * udpate jest, jest-cli, @types/jest to v24 * fix type error in kibana-i18n package * return serivce explicitly to fix typings * add explicit never * suppress typings errors * update jest versions in x-pack * make tests in x-pack more robust and fix incompatibility * suppress CallCluster mock typings Mock interface doesn't match CallCluster. Requires additional work * x-pack. resolve other typing conflicts * remove unused types/jest * fix snapshots * restore mocks after jest.spyOn * remove outdated definitions for jest * cleanup x-pack package.json and update @types/jest * fix tests merged from master * updated yarn.lock and log errors for scripts/type_check * This commit fixes error in TS, which failed on parsing the file. * suppress type errors from master * jest-cli is devDep * updated yarn.lock

Fixes elastic#32619 With elastic#31825 the reporter contract changed slightly and this updates our custom reporter to fix our junit reports.

mshustov added 5 commits February 22, 2019 17:43

udpate jest, jest-cli, @types/jest to v24

a51433c

fix type error in kibana-i18n package

407f05f

return serivce explicitly to fix typings

50d304f

add explicit never

b720d65

suppress typings errors

6fa51a7

mshustov changed the title ~~Update jest~~ Update jest to v24 Feb 22, 2019

mshustov added 4 commits February 24, 2019 15:18

update jest versions in x-pack

ceca217

make tests in x-pack more robust and fix incompatibility

4965ef2

suppress CallCluster mock typings

86b04fa

Mock interface doesn't match CallCluster. Requires additional work

x-pack. resolve other typing conflicts

ec6a293

mshustov commented Feb 24, 2019

View reviewed changes

remove unused types/jest

a10c162

mshustov commented Feb 24, 2019

View reviewed changes

fix snapshots

443a965

mshustov requested a review from a team February 24, 2019 18:22

mshustov added the Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc label Feb 24, 2019

mshustov added the non-issue Indicates to automation that a pull request should not appear in the release notes label Feb 24, 2019

mshustov marked this pull request as ready for review February 25, 2019 13:07

mshustov requested review from a team as code owners February 25, 2019 13:07

sorenlouv approved these changes Feb 25, 2019

View reviewed changes

joshdover reviewed Feb 25, 2019

View reviewed changes

kobelb approved these changes Feb 27, 2019

View reviewed changes

joshdover approved these changes Feb 27, 2019

View reviewed changes

mshustov added the v7.2.0 label Feb 28, 2019

Merge branch 'master' into update-jest

1d94ac9

azasypkin approved these changes Feb 28, 2019

View reviewed changes

mshustov added 4 commits February 28, 2019 12:18

updated yarn.lock and log errors for scripts/type_check

cf67999

This commit fixes error in TS, which failed on parsing the file.

b4fa793

suppress type errors from master

d50fc60

jest-cli is devDep

a83aaf8

mshustov merged commit 5fc7add into elastic:master Feb 28, 2019

mshustov deleted the update-jest branch February 28, 2019 12:26

mshustov mentioned this pull request Feb 28, 2019

[7.x] Update jest to v24 (#31825) #32193

Merged

mshustov mentioned this pull request Feb 28, 2019

[7.0] Update jest to v24 (#31825) #32194

Merged

mshustov mentioned this pull request Mar 1, 2019

Update babel jest #32326

Closed

3 tasks

spalger mentioned this pull request Mar 7, 2019

[jest/junit] fix junit reporter #32686

Merged

mshustov added the backported label Mar 8, 2019

spalger added v7.0.0 v8.0.0 labels Mar 8, 2019

cqliu1 pushed a commit to cqliu1/kibana that referenced this pull request Mar 8, 2019

[jest/junit] fix junit reporter (elastic#32686)

5f6ff8b

Fixes elastic#32619 With elastic#31825 the reporter contract changed slightly and this updates our custom reporter to fix our junit reports.

spalger pushed a commit to spalger/kibana that referenced this pull request Mar 8, 2019

[jest/junit] fix junit reporter (elastic#32686)

75ba62c

Fixes elastic#32619 With elastic#31825 the reporter contract changed slightly and this updates our custom reporter to fix our junit reports.

spalger pushed a commit to spalger/kibana that referenced this pull request Mar 8, 2019

[jest/junit] fix junit reporter (elastic#32686)

90c013a

Fixes elastic#32619 With elastic#31825 the reporter contract changed slightly and this updates our custom reporter to fix our junit reports.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update jest to v24 #31825

Update jest to v24 #31825

mshustov commented Feb 22, 2019 •

edited

Loading

elasticmachine commented Feb 22, 2019

epixa commented Feb 22, 2019

mshustov Feb 24, 2019

mshustov Feb 24, 2019

joshdover Feb 25, 2019

mshustov Feb 24, 2019 •

edited

Loading

mshustov Feb 24, 2019

sorenlouv Feb 25, 2019

mshustov Feb 27, 2019

elasticmachine commented Feb 24, 2019

elasticmachine commented Feb 24, 2019

elasticmachine commented Feb 24, 2019

sorenlouv left a comment

joshdover left a comment

joshdover Feb 25, 2019

mshustov Feb 26, 2019

joshdover Feb 27, 2019

joshdover Feb 25, 2019

joshdover Feb 25, 2019

mshustov Feb 26, 2019

joshdover Feb 25, 2019

joshdover Feb 25, 2019

joshdover Feb 25, 2019

azasypkin left a comment

azasypkin Feb 28, 2019

mshustov Feb 28, 2019

mshustov Mar 1, 2019

azasypkin Feb 28, 2019

mshustov Feb 28, 2019

elasticmachine commented Feb 28, 2019

Update jest to v24 #31825

Update jest to v24 #31825

Conversation

mshustov commented Feb 22, 2019 • edited Loading

Summary

Checklist

For maintainers

elasticmachine commented Feb 22, 2019

💔 Build Failed

epixa commented Feb 22, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mshustov Feb 24, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticmachine commented Feb 24, 2019

💔 Build Failed

elasticmachine commented Feb 24, 2019

💚 Build Succeeded

elasticmachine commented Feb 24, 2019

sorenlouv left a comment

Choose a reason for hiding this comment

joshdover left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

azasypkin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticmachine commented Feb 28, 2019

💚 Build Succeeded

mshustov commented Feb 22, 2019 •

edited

Loading

mshustov Feb 24, 2019 •

edited

Loading