more test type failures fixes

elastic · Apr 20, 2022 · 861b5ee · 861b5ee
1 parent 169c73b
commit 861b5ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -93,7 +93,7 @@ describe('When calling package policy', () => {
   let routerMock: jest.Mocked<FleetAuthzRouter>;
   let routeHandler: FleetRequestHandler<any, any, any>;
   let routeConfig: RouteConfig<any, any, any, any>;
-  let context: jest.Mocked<FleetRequestHandlerContext>;
+  let context: FleetRequestHandlerContext;
   let response: ReturnType<typeof httpServerMock.createResponseFactory>;
 
   beforeEach(() => {

diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
@@ -30,7 +30,7 @@ jest.mock('../../services/setup', () => {
 const mockSetupFleet = setupFleet as jest.MockedFunction<typeof setupFleet>;
 
 describe('FleetSetupHandler', () => {
-  let context: AwaitedProperties<FleetRequestHandlerContext>;
+  let context: AwaitedProperties<Omit<FleetRequestHandlerContext, 'resolve'>>;
   let response: ReturnType<typeof httpServerMock.createResponseFactory>;
   let request: ReturnType<typeof httpServerMock.createKibanaRequest>;
 

diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IRouter, Logger, RequestHandlerContext } from '@kbn/core/server';
+import type { IRouter, Logger, CustomRequestHandlerContext } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import type { DataPluginStart } from '@kbn/data-plugin/server/plugin';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
@@ -113,10 +113,9 @@ export interface ReportingStartDeps {
   taskManager: TaskManagerStartContract;
 }
 
-export interface ReportingRequestHandlerContext {
+export type ReportingRequestHandlerContext = CustomRequestHandlerContext<{
   reporting: ReportingStart | null;
-  core: RequestHandlerContext['core'];
-}
+}>;
 
 export type ReportingPluginRouter = IRouter<ReportingRequestHandlerContext>;