Done re-enabling component integration tests

elastic · Dec 10, 2019 · 6e90b77 · 6e90b77
1 parent c6aef83
commit 6e90b77
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 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
@@ -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
@@ -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
@@ -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
@@ -38,7 +38,7 @@ const watch = {
   },
 };
 
-describe.skip('<WatchStatus />', () => {
+describe('<WatchStatus />', () => {
   const { server, httpRequestsMockHelpers } = setupEnvironment();
   let testBed: WatchStatusTestBed;