From 6e90b776069d1387fad52ddff4636a6a43eb0008 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Tue, 10 Dec 2019 18:40:17 +0100
Subject: [PATCH] Done re-enabling component integration tests

---
 .../helpers/app_context.mock.tsx              | 53 ++++++++++---------
 .../helpers/http_requests.ts                  |  2 +-
 .../helpers/setup_environment.ts              |  4 +-
 .../client_integration/watch_status.test.ts   |  2 +-
 4 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx b/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
index f61272bcf6a39..fb36da85fb7f9 100644
--- a/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
+++ b/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
@@ -15,34 +15,35 @@ import {
 } from '../../../../../../../src/core/public/mocks';
 import { AppContextProvider } from '../../../public/np_ready/application/app_context';
 
+export const mockContextValue = {
+  docLinks: docLinksServiceMock.createStartContract(),
+  chrome: chromeServiceMock.createStartContract(),
+  legacy: {
+    TimeBuckets: class MockTimeBuckes {
+      setBounds(_domain: any) {
+        return {};
+      }
+      getInterval() {
+        return {
+          expression: {},
+        };
+      }
+    },
+    MANAGEMENT_BREADCRUMB: { text: 'test' },
+    licenseStatus: {},
+  },
+  uiSettings: uiSettingsServiceMock.createSetupContract(),
+  toasts: notificationServiceMock.createSetupContract().toasts,
+  euiUtils: {
+    useChartsTheme: jest.fn(),
+  },
+  // For our test harness, we don't use this mocked out http service
+  http: httpServiceMock.createSetupContract(),
+};
+
 export const withAppContext = (Component: ComponentType<any>) => (props: any) => {
   return (
-    <AppContextProvider
-      value={{
-        docLinks: docLinksServiceMock.createStartContract(),
-        chrome: chromeServiceMock.createStartContract(),
-        legacy: {
-          TimeBuckets: class MockTimeBuckes {
-            setBounds(_domain: any) {
-              return {};
-            }
-            getInterval() {
-              return {
-                expression: {},
-              };
-            }
-          },
-          MANAGEMENT_BREADCRUMB: { text: 'test' },
-          licenseStatus: {},
-        },
-        uiSettings: uiSettingsServiceMock.createSetupContract(),
-        toasts: notificationServiceMock.createSetupContract().toasts,
-        euiUtils: {
-          useChartsTheme: jest.fn(),
-        },
-        http: httpServiceMock.createSetupContract(),
-      }}
-    >
+    <AppContextProvider value={mockContextValue}>
       <Component {...props} />
     </AppContextProvider>
   );
diff --git a/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts b/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
index 2170559dace5a..7d9c1e4163d7b 100644
--- a/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
@@ -34,7 +34,7 @@ const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
     const defaultResponse = { watchHistoryItems: [] };
     server.respondWith(
       'GET',
-      `${API_ROOT}/watch/:id/history?startTime=*`,
+      `${API_ROOT}/watch/:id/history`,
       mockResponse(defaultResponse, response)
     );
   };
diff --git a/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/setup_environment.ts b/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/setup_environment.ts
index c9df2329763a3..7e748073c1c6b 100644
--- a/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/setup_environment.ts
+++ b/x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/setup_environment.ts
@@ -14,7 +14,9 @@ mockHttpClient.interceptors.response.use(
   res => {
     return res.data;
   },
-  rej => rej
+  rej => {
+    return Promise.reject(rej);
+  }
 );
 
 const mockSavedObjectsClient = () => {
diff --git a/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_status.test.ts b/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_status.test.ts
index d266549026bc6..973c14893f342 100644
--- a/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_status.test.ts
+++ b/x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_status.test.ts
@@ -38,7 +38,7 @@ const watch = {
   },
 };
 
-describe.skip('<WatchStatus />', () => {
+describe('<WatchStatus />', () => {
   const { server, httpRequestsMockHelpers } = setupEnvironment();
   let testBed: WatchStatusTestBed;