move toolkit mock to http_server mock

src/core/server/http/cookie_session_storage.test.ts

@@ -58,6 +58,10 @@ configService.atPath.mockReturnValue(
       verificationMode: 'none',
     },
     compression: { enabled: true },
+    xsrf: {
+      disableProtection: true,
+      whitelist: [],
+    },
   } as any)
 );
 

src/core/server/http/http_server.mocks.ts

@@ -30,6 +30,9 @@ import {
   RouteMethod,
   KibanaResponseFactory,
 } from './router';
+import { OnPreResponseToolkit } from './lifecycle/on_pre_response';
+import { OnPostAuthToolkit } from './lifecycle/on_post_auth';
+import { OnPreAuthToolkit } from './lifecycle/on_pre_auth';
 
 interface RequestFixtureOptions {
   headers?: Record<string, string>;
@@ -137,9 +140,19 @@ const createLifecycleResponseFactoryMock = (): jest.Mocked<LifecycleResponseFact
   customError: jest.fn(),
 });
 
+type ToolkitMock = jest.Mocked<OnPreResponseToolkit & OnPostAuthToolkit & OnPreAuthToolkit>;
+
+const createToolkitMock = (): ToolkitMock => {
+  return {
+    next: jest.fn(),
+    rewriteUrl: jest.fn(),
+  };
+};
+
 export const httpServerMock = {
   createKibanaRequest: createKibanaRequestMock,
   createRawRequest: createRawRequestMock,
   createResponseFactory: createResponseFactoryMock,
   createLifecycleResponseFactory: createLifecycleResponseFactoryMock,
+  createToolkit: createToolkitMock,
 };

src/core/server/http/http_service.test.mocks.ts

@@ -27,3 +27,7 @@ jest.mock('./http_server', () => {
     HttpServer: mockHttpServer,
   };
 });
+
+jest.mock('./lifecycle_handlers', () => ({
+  registerCoreHandlers: jest.fn(),
+}));

src/core/server/http/lifecycle_handlers.test.ts

@@ -22,7 +22,7 @@ import {
   createVersionCheckPostAuthHandler,
   createXsrfPostAuthHandler,
 } from './lifecycle_handlers';
-import { lifecycleMock } from './lifecycle/lifecycle_mock';
+import { httpServerMock } from './http_server.mocks';
 import { HttpConfig } from './http_config';
 import { KibanaRequest, RouteMethod } from './router';
 
@@ -47,12 +47,12 @@ const forgeRequest = ({
 };
 
 describe('xsrf post-auth handler', () => {
-  let toolkit: ReturnType<typeof lifecycleMock.createToolkit>;
-  let responseFactory: ReturnType<typeof lifecycleMock.createLifecycleResponseFactory>;
+  let toolkit: ReturnType<typeof httpServerMock.createToolkit>;
+  let responseFactory: ReturnType<typeof httpServerMock.createLifecycleResponseFactory>;
 
   beforeEach(() => {
-    toolkit = lifecycleMock.createToolkit();
-    responseFactory = lifecycleMock.createLifecycleResponseFactory();
+    toolkit = httpServerMock.createToolkit();
+    responseFactory = httpServerMock.createLifecycleResponseFactory();
   });
 
   describe('non destructive methods', () => {
@@ -152,12 +152,12 @@ describe('xsrf post-auth handler', () => {
 });
 
 describe('versionCheck post-auth handler', () => {
-  let toolkit: ReturnType<typeof lifecycleMock.createToolkit>;
-  let responseFactory: ReturnType<typeof lifecycleMock.createLifecycleResponseFactory>;
+  let toolkit: ReturnType<typeof httpServerMock.createToolkit>;
+  let responseFactory: ReturnType<typeof httpServerMock.createLifecycleResponseFactory>;
 
   beforeEach(() => {
-    toolkit = lifecycleMock.createToolkit();
-    responseFactory = lifecycleMock.createLifecycleResponseFactory();
+    toolkit = httpServerMock.createToolkit();
+    responseFactory = httpServerMock.createLifecycleResponseFactory();
   });
 
   it('forward the request to the next interceptor if header matches', () => {
@@ -212,10 +212,10 @@ describe('versionCheck post-auth handler', () => {
 });
 
 describe('customHeaders pre-response handler', () => {
-  let toolkit: ReturnType<typeof lifecycleMock.createToolkit>;
+  let toolkit: ReturnType<typeof httpServerMock.createToolkit>;
 
   beforeEach(() => {
-    toolkit = lifecycleMock.createToolkit();
+    toolkit = httpServerMock.createToolkit();
   });
 
   it('adds the kbn-name header to the response', () => {

src/core/server/mocks.ts

@@ -38,7 +38,6 @@ export { httpServiceMock } from './http/http_service.mock';
 export { loggingServiceMock } from './logging/logging_service.mock';
 export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
-export { lifecycleMock } from './http/lifecycle/lifecycle_mock';
 import { uuidServiceMock } from './uuid/uuid_service.mock';
 
 export function pluginInitializerContextConfigMock<T>(config: T) {