Consolidates Jest configuration files and scripts by tylersmalley · Pull Request #82671 · elastic/kibana

tylersmalley · 2020-11-04T23:25:48Z

Jest tests are currently organized into two main configuration files (src/dev/jest/config.js and x-pack/dev-tools/jest/create_jest_config.js). Both of these are similar, but very slightly due to previously being in separate repositories. This change consolidates the scripts referenced in those configs, moving them to the @kbn/test project.

Blocker to #72569

Reviews: This change will trigger a review from almost all teams, however considering the nature of these changes I don't believe that is necessary. These changes are only in tests, and mostly moving files around.

Overview:

Consolidates scripts from src/dev/jest, src/test_utils, and x-pack/test-utils into packages/kbn-test/src/jest
Common configuration options from src/dev/jest/config.js and x-pack/dev-tools/jest moved to packages/kbn-test/jest-preset.json.
OSS contained an alias for test_utils. Those aliases have been removed in favor of importing these utilities from @kbn/test/jest

Jest tests are currently organized into main configuration files (src/dev/jest/config.js and x-pack/dev-tools/jest/create_jest_config.js). Both of these are similar, but very slightly due to previously being in separate repositories. This change consolidates the scripts referenced in those configs and moves them to the `@kbn/test` project. OSS contained an alias for `test_utils`. Those aliases have been removed in favor of importing these utilities from `@kbn/test/jest` Blocker to elastic#72569 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

elasticmachine · 2020-11-12T15:25:43Z

Pinging @elastic/kibana-operations (Team:Operations)

mikecote

Alerting code changes LGTM

peteharverson

ML edits LGTM

mistic

LGTM

nreese

Maps changes LGTM
code review

lukeelmers

app arch changes LGTM

spalger · 2020-11-12T19:48:39Z

packages/kbn-test/package.json

+    "@kbn/expect": "link:../kbn-expect",
    "@kbn/utils": "link:../kbn-utils"
  }
-}


Please install the editorconfig plugin in your editor so that this doesn't keep getting flipped back in forth in every PR

I don't believe we have come to a consensus on if we should have newlines or not?

I swapped it because the few I checked had trailing newlines, and I hate seeing the red notice in the Github UI. However, looks like we mostly don't use newlines so I will revert this one.

find packages -name "package.json" | xargs tail -n 1

Yeah, it's not exactly enforced but the contributing guides says to install the editorconfig plugin and that config has a rule for package.json specifically (also npm/yarn don't add the extra newline IIRC) https://github.com/elastic/kibana/blob/master/.editorconfig#L11-L14

Apparently there is an editorconfig plugin for eslint, so if we wanted to pass those files through eslint too we could, but that's a separate issue.

legrego

Security LGTM

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

kibanamachine · 2020-11-13T00:04:57Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: e02d309

Metrics [docs]

✅ unchanged

History

💚 Build #87540 succeeded cee11cc
💔 Build #87535 failed b11528d713e5282bd4f9e93c3e810c677ff835b0
💔 Build #87517 failed 0155fce
💔 Build #87523 failed 7d060b487cbd2ee03a107597f518672c34c78d2e
💔 Build #87504 failed 50bba72

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

tylersmalley · 2020-11-13T00:19:36Z

Have received quite a few reviews, but still, some remain. Per the description, I am going to move forward with merging due to the nature of the changes. If any issues are raised, I am happy to address them in a follow-up.

Jest tests are currently organized into main configuration files (src/dev/jest/config.js and x-pack/dev-tools/jest/create_jest_config.js). Both of these are similar, but very slightly due to previously being in separate repositories. This change consolidates the scripts referenced in those configs and moves them to the `@kbn/test` project. OSS contained an alias for `test_utils`. Those aliases have been removed in favor of importing these utilities from `@kbn/test/jest` Blocker to elastic#72569 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Jest tests are currently organized into main configuration files (src/dev/jest/config.js and x-pack/dev-tools/jest/create_jest_config.js). Both of these are similar, but very slightly due to previously being in separate repositories. This change consolidates the scripts referenced in those configs and moves them to the `@kbn/test` project. OSS contained an alias for `test_utils`. Those aliases have been removed in favor of importing these utilities from `@kbn/test/jest` Blocker to #72569 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

* master: [Security Solution][Detections] Adds framework for replacing API schemas (elastic#82462) [Enterprise Search] Share Loading component (elastic#83246) Consolidates Jest configuration files and scripts (elastic#82671) APM header changes (elastic#82870) [Security Solutions] Adds a default for indicator match custom query of *:* (elastic#81727) [Security Solution] Note 10k object paging limit on Endpoint list (elastic#82889) [packerCache] fix gulp usage, don't archive node_modules (elastic#83327) Upgrade Node.js to version 12 (elastic#61587) [Actions] Removing placeholders and updating validation messages on connector forms (elastic#82734) [Fleet] Rename ingest_manager_api_integration tests fleet_api_integration (elastic#83011) [DOCS] Updates Discover docs (elastic#82773) [ML] Data frame analytics: Adds map view (elastic#81666) enables actions scoped within the stack to register at Basic license (elastic#82931)

tylersmalley force-pushed the single-jest-config branch 4 times, most recently from 7d060b4 to b11528d Compare November 12, 2020 05:05

tylersmalley changed the title ~~Single jest config~~ Centralize Jest configuration Nov 12, 2020

tylersmalley force-pushed the single-jest-config branch from b11528d to 57db0b9 Compare November 12, 2020 05:22

tylersmalley added 2 commits November 11, 2020 21:41

Removes rest of x-pack/test_utils

cee11cc

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley force-pushed the single-jest-config branch from 57db0b9 to cee11cc Compare November 12, 2020 05:43

tylersmalley changed the title ~~Centralize Jest configuration~~ Consolidates Jest configuration Nov 12, 2020

tylersmalley changed the title ~~Consolidates Jest configuration~~ Consolidates Jest configuration files and scripts Nov 12, 2020

tylersmalley added Team:Operations Kibana-Operations Team v7.11 v8.0.0 release_note:skip Skip the PR/issue when compiling release notes labels Nov 12, 2020

tylersmalley marked this pull request as ready for review November 12, 2020 15:25

tylersmalley requested review from a team as code owners November 12, 2020 15:25

tylersmalley requested a review from a team November 12, 2020 15:25

tylersmalley requested a review from a team as a code owner November 12, 2020 15:25

tylersmalley requested a review from a team November 12, 2020 15:25

tylersmalley requested review from a team as code owners November 12, 2020 15:25

myasonik approved these changes Nov 12, 2020

View reviewed changes

botelastic bot added the Feature:Embedding Embedding content via iFrame label Nov 12, 2020

mikecote approved these changes Nov 12, 2020

View reviewed changes

peteharverson approved these changes Nov 12, 2020

View reviewed changes

chrisronline approved these changes Nov 12, 2020

View reviewed changes

mistic approved these changes Nov 12, 2020

View reviewed changes

nreese approved these changes Nov 12, 2020

View reviewed changes

lukeelmers approved these changes Nov 12, 2020

View reviewed changes

spalger added v7.11.0 and removed v7.11 labels Nov 12, 2020

spalger reviewed Nov 12, 2020

View reviewed changes

pgayvallet approved these changes Nov 12, 2020

View reviewed changes

legrego approved these changes Nov 12, 2020

View reviewed changes

tylersmalley added 4 commits November 12, 2020 14:07

Merge remote-tracking branch 'upstream/master' into single-jest-config

d331994

Adds testbed README

9f0e49d

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Revert newline

47c6d4c

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Revert newline

e02d309

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley merged commit aba2068 into elastic:master Nov 13, 2020

tylersmalley mentioned this pull request Nov 13, 2020

[7.x] Consolidates Jest configuration files and scripts (#82671) #83362

Merged

smith mentioned this pull request Nov 16, 2020

[APM] Ensure APM jest script can run #83398

Merged

tylersmalley mentioned this pull request Nov 20, 2020

Jest multi-project configuration #77894

Merged

1 task

Conversation

tylersmalley commented Nov 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticmachine commented Nov 12, 2020

Uh oh!

mikecote left a comment

Choose a reason for hiding this comment

Uh oh!

peteharverson left a comment

Choose a reason for hiding this comment

Uh oh!

mistic left a comment

Choose a reason for hiding this comment

Uh oh!

nreese left a comment

Choose a reason for hiding this comment

Uh oh!

lukeelmers left a comment

Choose a reason for hiding this comment

Uh oh!

spalger Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

tylersmalley Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

tylersmalley Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

spalger Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

spalger Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

legrego left a comment

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Nov 13, 2020

💚 Build Succeeded

Metrics [docs]

History

Uh oh!

tylersmalley commented Nov 13, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

tylersmalley commented Nov 4, 2020 •

edited

Loading