Fix mocks

x-pack/mocks.ts

@@ -9,7 +9,7 @@ import { licensingMock } from './plugins/licensing/server/mocks';
 function createCoreRequestHandlerContextMock() {
   return {
     core: coreMock.createRequestHandlerContext(),
-    licensing: { license: licensingMock.createLicense() },
+    licensing: licensingMock.createRequestHandlerContext(),
   };
 }
 

x-pack/plugins/features/server/routes/index.test.ts

@@ -16,9 +16,7 @@ import { FeatureConfig } from '../../common';
 function createContextMock(licenseType: LicenseType = 'gold') {
   return {
     core: coreMock.createRequestHandlerContext(),
-    licensing: {
-      license: licensingMock.createLicense({ license: { type: licenseType } }),
-    },
+    licensing: licensingMock.createRequestHandlerContext({ license: { type: licenseType } }),
   };
 }
 

x-pack/plugins/licensing/server/mocks.ts

@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { BehaviorSubject } from 'rxjs';
-import { LicensingPluginSetup, LicensingPluginStart } from './types';
+import {
+  LicensingPluginSetup,
+  LicensingPluginStart,
+  LicensingRequestHandlerContext,
+} from './types';
 import { licenseMock } from '../common/licensing.mock';
 import { featureUsageMock } from './services/feature_usage_service.mock';
 
@@ -43,8 +47,20 @@ const createStartMock = (): jest.Mocked<LicensingPluginStart> => {
   return mock;
 };
 
+const createRequestHandlerContextMock = (
+  ...options: Parameters<typeof licenseMock.createLicense>
+): jest.Mocked<LicensingRequestHandlerContext> => {
+  const mock: jest.Mocked<LicensingRequestHandlerContext> = {
+    license: licenseMock.createLicense(...options),
+    featureUsage: featureUsageMock.createStart(),
+  };
+
+  return mock;
+};
+
 export const licensingMock = {
   createSetup: createSetupMock,
   createStart: createStartMock,
+  createRequestHandlerContext: createRequestHandlerContextMock,
   ...licenseMock,
 };

x-pack/plugins/licensing/server/types.ts

@@ -40,12 +40,18 @@ export interface RawLicense {
   mode: LicenseType;
 }
 
+/**
+ * The APIs exposed on the `licensing` key of {@link RequestHandlerContext} for plugins that depend on licensing.
+ * @public
+ */
+export interface LicensingRequestHandlerContext {
+  featureUsage: FeatureUsageServiceStart;
+  license: ILicense;
+}
+
 declare module 'src/core/server' {
   interface RequestHandlerContext {
-    licensing: {
-      featureUsage: FeatureUsageServiceStart;
-      license: ILicense;
-    };
+    licensing: LicensingRequestHandlerContext;
   }
 }