Fix ScopedHistory mock and adapt usages #71404

pgayvallet · 2020-07-13T08:28:09Z

Summary

Make the ScopedHistoryMock type actually extends ScopedHistory
Adapt test usages and remove (now) unnecessary casting

pgayvallet · 2020-07-13T08:32:20Z

src/core/public/application/scoped_history.mock.ts

-  return mock;
+  return mock as ScopedHistoryMock;


So, I thought about creating a IScopedHistory interface, however the concrete ScopedHistory type is widely used in the codebase, so it was causing a lot of changes, which is why I decided to force cast to jest.Mocked<ScopedHistory> instead.

I think this is fine because:

this is only used for testing

we are still ensuring that the mock implements all public methods/properties of ScopedHistory with the const mock: jest.Mocked<Pick<ScopedHistory, keyof ScopedHistory>> declaration, so any changes in ScopedHistory public API would cause a TS error until the mock construction is adapted.

only private methods and properties are actually missing from the returned mock instance.

Could you add a comment on why the casting is necessary?

elasticmachine · 2020-07-13T08:32:59Z

Pinging @elastic/kibana-platform (Team:Platform)

mshustov · 2020-07-13T09:56:52Z

src/core/public/application/scoped_history.mock.ts

-  return mock;
+  return mock as ScopedHistoryMock;


Could you add a comment on why the casting is necessary?

azasypkin

Security/Spaces code LGTM, thanks!

mikecote

Alerting changes LGTM

lizozom

AppArch changes LGTM

alisonelizabeth

ES UI changes LGTM

…ped-history-mock

kibanamachine · 2020-07-14T07:39:00Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 6a2b70f

Build metrics

✅ unchanged

History

💛 Build #60942 was flaky a399096
💚 Build #60784 succeeded a98ab1e
💔 Build #60744 failed 6bb9e18

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

* Fix mock and adapt usages * fix snapshots * add comment about forcecast * remove mock overrides

* master: (314 commits) [APM] Use status_code field to calculate error rate (elastic#71109) [Observability] Change appLink passing the date range (elastic#71259) [Security] Add Timeline improvements (elastic#71506) adjust vislib bar opacity (elastic#71421) Fix ScopedHistory mock and adapt usages (elastic#71404) [Security Solution] Add hook for reading/writing resolver query params (elastic#70809) [APM] Bug fixes from ML integration testing (elastic#71564) [Discover] Add caused_by.type and caused_by.reason to error toast modal (elastic#70404) [Security Solution] Add 3rd level breadcrumb to admin page (elastic#71275) [Security Solution][Exceptions] Exception modal bulk close alerts that match exception attributes (elastic#71321) Change signal.rule.risk score mapping from keyword to float (elastic#71126) Added help text where needed on connectors and alert actions UI (elastic#69601) [SIEM][Detections] Value Lists Management Modal (elastic#67068) [test] Skips test preventing promotion of ES snapshot elastic#71582 [test] Skips test preventing promotion of ES snapshot elastic#71555 [ILM] Fix alignment of the timing field (elastic#71273) [SIEM][Detection Engine][Lists] Adds the ability for exception lists to be multi-list queried. (elastic#71540) initial telemetry setup (elastic#69330) [Reporting] Formatting fixes for CSV export in Discover, CSV download from Dashboard panel (elastic#67027) Search across spaces (elastic#67644) ...

…t-apps-page-titles * 'master' of github.com:elastic/kibana: (88 commits) [ML] Functional tests - disable DFA creation and cloning tests [APM] Use status_code field to calculate error rate (elastic#71109) [Observability] Change appLink passing the date range (elastic#71259) [Security] Add Timeline improvements (elastic#71506) adjust vislib bar opacity (elastic#71421) Fix ScopedHistory mock and adapt usages (elastic#71404) [Security Solution] Add hook for reading/writing resolver query params (elastic#70809) [APM] Bug fixes from ML integration testing (elastic#71564) [Discover] Add caused_by.type and caused_by.reason to error toast modal (elastic#70404) [Security Solution] Add 3rd level breadcrumb to admin page (elastic#71275) [Security Solution][Exceptions] Exception modal bulk close alerts that match exception attributes (elastic#71321) Change signal.rule.risk score mapping from keyword to float (elastic#71126) Added help text where needed on connectors and alert actions UI (elastic#69601) [SIEM][Detections] Value Lists Management Modal (elastic#67068) [test] Skips test preventing promotion of ES snapshot elastic#71582 [test] Skips test preventing promotion of ES snapshot elastic#71555 [ILM] Fix alignment of the timing field (elastic#71273) [SIEM][Detection Engine][Lists] Adds the ability for exception lists to be multi-list queried. (elastic#71540) initial telemetry setup (elastic#69330) [Reporting] Formatting fixes for CSV export in Discover, CSV download from Dashboard panel (elastic#67027) ... # Conflicts: # x-pack/plugins/index_management/public/application/index.tsx

* master: (72 commits) [test] Skips test preventing promotion of ES snapshot elastic#71612 [Logs UI] Remove UUID from Alert Instances (elastic#71340) [Metrics UI] Remove UUID from Alert Instance IDs (elastic#71335) [ML] Functional tests - disable DFA creation and cloning tests [APM] Use status_code field to calculate error rate (elastic#71109) [Observability] Change appLink passing the date range (elastic#71259) [Security] Add Timeline improvements (elastic#71506) adjust vislib bar opacity (elastic#71421) Fix ScopedHistory mock and adapt usages (elastic#71404) [Security Solution] Add hook for reading/writing resolver query params (elastic#70809) [APM] Bug fixes from ML integration testing (elastic#71564) [Discover] Add caused_by.type and caused_by.reason to error toast modal (elastic#70404) [Security Solution] Add 3rd level breadcrumb to admin page (elastic#71275) [Security Solution][Exceptions] Exception modal bulk close alerts that match exception attributes (elastic#71321) Change signal.rule.risk score mapping from keyword to float (elastic#71126) Added help text where needed on connectors and alert actions UI (elastic#69601) [SIEM][Detections] Value Lists Management Modal (elastic#67068) [test] Skips test preventing promotion of ES snapshot elastic#71582 [test] Skips test preventing promotion of ES snapshot elastic#71555 [ILM] Fix alignment of the timing field (elastic#71273) ...

Fix mock and adapt usages

6bb9e18

pgayvallet commented Jul 13, 2020

View reviewed changes

pgayvallet added release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.9.0 v8.0.0 labels Jul 13, 2020

pgayvallet marked this pull request as ready for review July 13, 2020 08:32

pgayvallet requested review from a team as code owners July 13, 2020 08:32

botelastic bot added the Feature:Embedding Embedding content via iFrame label Jul 13, 2020

mshustov approved these changes Jul 13, 2020

View reviewed changes

azasypkin approved these changes Jul 13, 2020

View reviewed changes

pgayvallet added 2 commits July 13, 2020 12:02

fix snapshots

bbb97fc

add comment about forcecast

a98ab1e

mikecote approved these changes Jul 13, 2020

View reviewed changes

lizozom approved these changes Jul 13, 2020

View reviewed changes

alisonelizabeth approved these changes Jul 13, 2020

View reviewed changes

pgayvallet added 3 commits July 13, 2020 18:02

remove mock overrides

3497b72

Merge remote-tracking branch 'upstream/master' into kbn-71166-fix-sco…

a399096

…ped-history-mock

Merge remote-tracking branch 'upstream/master' into kbn-71166-fix-sco…

6a2b70f

…ped-history-mock

pgayvallet merged commit f0fe9b1 into elastic:master Jul 14, 2020

pgayvallet mentioned this pull request Jul 14, 2020

[7.x] Fix ScopedHistory mock and adapt usages (#71404) #71599

Merged

pgayvallet added a commit to pgayvallet/kibana that referenced this pull request Jul 14, 2020

Fix ScopedHistory mock and adapt usages (elastic#71404)

f6803e7

* Fix mock and adapt usages * fix snapshots * add comment about forcecast * remove mock overrides

pgayvallet added a commit that referenced this pull request Jul 14, 2020

Fix ScopedHistory mock and adapt usages (#71404) (#71599)

3c24ff4

* Fix mock and adapt usages * fix snapshots * add comment about forcecast * remove mock overrides

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ScopedHistory mock and adapt usages #71404

Fix ScopedHistory mock and adapt usages #71404

pgayvallet commented Jul 13, 2020 •

edited

Loading

pgayvallet Jul 13, 2020

mshustov Jul 13, 2020

elasticmachine commented Jul 13, 2020

mshustov Jul 13, 2020

azasypkin left a comment

mikecote left a comment

lizozom left a comment

alisonelizabeth left a comment

kibanamachine commented Jul 14, 2020

Fix ScopedHistory mock and adapt usages #71404

Fix ScopedHistory mock and adapt usages #71404

Conversation

pgayvallet commented Jul 13, 2020 • edited Loading

Summary

pgayvallet Jul 13, 2020

Choose a reason for hiding this comment

mshustov Jul 13, 2020

Choose a reason for hiding this comment

elasticmachine commented Jul 13, 2020

mshustov Jul 13, 2020

Choose a reason for hiding this comment

azasypkin left a comment

Choose a reason for hiding this comment

mikecote left a comment

Choose a reason for hiding this comment

lizozom left a comment

Choose a reason for hiding this comment

alisonelizabeth left a comment

Choose a reason for hiding this comment

kibanamachine commented Jul 14, 2020

💚 Build Succeeded

Build metrics

History

pgayvallet commented Jul 13, 2020 •

edited

Loading