address review feedback

Author: alisonelizabeth

x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/http_requests.helpers.ts

@@ -5,18 +5,9 @@
  */
 
 import sinon, { SinonFakeServer } from 'sinon';
-import axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
-
-/* eslint-disable @kbn/eslint/no-restricted-paths */
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
-
-import { uiMetricService, apiService } from '../../../services';
 
 type HttpResponse = Record<string, any> | any[];
 
-const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
-
 // Register helpers to mock HTTP Requests
 const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
   const setSimulatePipelineResponse = (response?: HttpResponse, error?: any) => {
@@ -38,11 +29,6 @@ const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
 export const initHttpRequests = () => {
   const server = sinon.fakeServer.create();
 
-  // Initialize mock services
-  uiMetricService.setup(usageCollectionPluginMock.createSetupContract());
-  // @ts-ignore
-  apiService.setup(mockHttpClient, uiMetricService);
-
   server.respondImmediately = true;
 
   // Define default response for unhandled requests.

x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.helpers.tsx

@@ -5,13 +5,26 @@
  */
 import { act } from 'react-dom/test-utils';
 import React from 'react';
+import axios from 'axios';
+import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
 import { notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
 
 import { LocationDescriptorObject } from 'history';
 import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
+
 import { registerTestBed, TestBed } from '../../../../../../../test_utils';
 import { stubWebWorker } from '../../../../../../../test_utils/stub_web_worker';
+
+import {
+  breadcrumbService,
+  uiMetricService,
+  documentationService,
+  apiService,
+} from '../../../services';
+
 import {
   ProcessorsEditorContextProvider,
   Props,
@@ -20,12 +33,7 @@ import {
 } from '../';
 import { TestPipelineActions } from '../';
 
-import {
-  breadcrumbService,
-  uiMetricService,
-  documentationService,
-  apiService,
-} from '../../../services';
+import { initHttpRequests } from './http_requests.helpers';
 
 stubWebWorker();
 
@@ -93,7 +101,8 @@ const testBedSetup = registerTestBed<TestSubject>(
     <KibanaContextProvider services={appServices}>
       <ProcessorsEditorContextProvider {...props}>
         <TestPipelineActions />
-        <ProcessorsEditor /> <GlobalOnFailureProcessorsEditor />
+        <ProcessorsEditor />
+        <GlobalOnFailureProcessorsEditor />
       </ProcessorsEditorContextProvider>
     </KibanaContextProvider>
   ),
@@ -182,6 +191,22 @@ export const setup = async (props: Props): Promise<SetupResult> => {
   };
 };
 
+const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
+
+export const setupEnvironment = () => {
+  // Initialize mock services
+  uiMetricService.setup(usageCollectionPluginMock.createSetupContract());
+  // @ts-ignore
+  apiService.setup(mockHttpClient, uiMetricService);
+
+  const { server, httpRequestsMockHelpers } = initHttpRequests();
+
+  return {
+    server,
+    httpRequestsMockHelpers,
+  };
+};
+
 type TestSubject =
   | 'addDocumentsButton'
   | 'testPipelineFlyout'

x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.test.tsx

@@ -7,8 +7,7 @@
 import { Pipeline } from '../../../../../common/types';
 
 import { VerboseTestOutput, Document } from '../types';
-import { setup, SetupResult } from './test_pipeline.helpers';
-import { initHttpRequests } from './http_requests.helpers';
+import { setup, SetupResult, setupEnvironment } from './test_pipeline.helpers';
 import { DOCUMENTS, SIMULATE_RESPONSE, PROCESSORS } from './constants';
 
 interface ReqBody {
@@ -21,7 +20,7 @@ describe('Test pipeline', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
 
-  const { server, httpRequestsMockHelpers } = initHttpRequests();
+  const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();