From 53c6e9a72342c301b74deda4a68a7975cabe3520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Tue, 11 Jul 2023 12:37:06 +0200
Subject: [PATCH] [APM] Fix broken unit tests

---
 .../error_count_rule_type/index.stories.tsx         | 13 ++++++++-----
 .../components/app/service_map/index.test.tsx       |  5 +++--
 .../transaction_overview.test.tsx                   | 10 ++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx b/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx
index 424e490b732b1..ddcae65209f67 100644
--- a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx
@@ -10,6 +10,7 @@ import React, { useState } from 'react';
 import { CoreStart } from '@kbn/core/public';
 import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { TIME_UNITS } from '@kbn/triggers-actions-ui-plugin/public';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { RuleParams, ErrorCountRuleType } from '.';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { createCallApmApi } from '../../../../services/rest/create_call_apm_api';
@@ -36,11 +37,13 @@ const stories: Meta<{}> = {
       createCallApmApi(coreMock);
 
       return (
-        <KibanaReactContext.Provider>
-          <div style={{ width: 400 }}>
-            <StoryComponent />
-          </div>
-        </KibanaReactContext.Provider>
+        <IntlProvider locale="en">
+          <KibanaReactContext.Provider>
+            <div style={{ width: 400 }}>
+              <StoryComponent />
+            </div>
+          </KibanaReactContext.Provider>
+        </IntlProvider>
       );
     },
   ],
diff --git a/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
index b844ff2cff098..2fe42bd7692bd 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { render } from '@testing-library/react';
-import { createMemoryHistory } from 'history';
+import { createMemoryHistory, MemoryHistory } from 'history';
 import { CoreStart } from '@kbn/core/public';
 import React, { ReactNode } from 'react';
 import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
@@ -18,7 +18,7 @@ import * as useFetcherModule from '../../../hooks/use_fetcher';
 import { ServiceMap } from '.';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
-const history = createMemoryHistory();
+let history: MemoryHistory<unknown>;
 
 const KibanaReactContext = createKibanaReactContext({
   usageCollection: { reportUiCounter: () => {} },
@@ -47,6 +47,7 @@ const expiredLicense = new License({
 });
 
 function createWrapper(license: License | null) {
+  history = createMemoryHistory();
   history.replace('/service-map?rangeFrom=now-15m&rangeTo=now');
 
   return ({ children }: { children?: ReactNode }) => {
diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
index bf144507ce867..79db66bcb5d43 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { queryByLabelText } from '@testing-library/react';
-import { createMemoryHistory } from 'history';
+import { createMemoryHistory, MemoryHistory } from 'history';
 import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
@@ -32,9 +32,7 @@ const KibanaReactContext = createKibanaReactContext({
   usageCollection: { reportUiCounter: () => {} },
 } as unknown as Partial<CoreStart>);
 
-const history = createMemoryHistory();
-jest.spyOn(history, 'push');
-jest.spyOn(history, 'replace');
+let history: MemoryHistory<unknown>;
 
 function setup({
   urlParams,
@@ -43,6 +41,10 @@ function setup({
   urlParams: ApmUrlParams;
   serviceTransactionTypes: string[];
 }) {
+  history = createMemoryHistory();
+  jest.spyOn(history, 'push');
+  jest.spyOn(history, 'replace');
+
   history.replace({
     pathname: '/services/foo/transactions',
     search: fromQuery(urlParams),