Fix e2e test

x-pack/test/licensing_plugin/config.public.ts

@@ -23,6 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
           KIBANA_ROOT,
           'test/plugin_functional/plugins/core_provider_plugin'
         )}`,
+        `--plugin-path=${path.resolve(__dirname, 'plugins/test_feature_usage')}`,
       ],
     },
   };

x-pack/test/licensing_plugin/plugins/test_feature_usage/kibana.json

@@ -0,0 +1,7 @@
+{
+  "id": "testFeatureUsage",
+  "version": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["licensing"]
+}

x-pack/test/licensing_plugin/plugins/test_feature_usage/public/index.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { TestFeatureUsagePlugin } from './plugin';
+
+export const plugin = () => new TestFeatureUsagePlugin();

x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts

@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup } from 'src/core/server';
+import { LicensingPluginSetup } from '../../../../../plugins/licensing/public';
+
+interface SetupPlugins {
+  licensing: LicensingPluginSetup;
+}
+
+export class TestFeatureUsagePlugin {
+  public setup(core: CoreSetup, plugins: SetupPlugins) {
+    plugins.licensing.featureUsage.register('test-client-A', 'gold');
+    plugins.licensing.featureUsage.register('test-client-B', 'enterprise');
+  }
+
+  public start() {}
+  public stop() {}
+}

x-pack/test/licensing_plugin/public/feature_usage.ts

@@ -25,19 +25,6 @@ export default function (ftrContext: FtrProviderContext) {
   const browser = getService('browser');
   const PageObjects = getPageObjects(['common', 'security']);
 
-  const registerFeature = async (featureName: string, licenseType: LicenseType) => {
-    await browser.executeAsync(
-      async (feature, type, cb) => {
-        const { setup } = window._coreProvider;
-        const licensing: LicensingPluginSetup = setup.plugins.licensing;
-        await licensing.featureUsage.register(feature, type);
-        cb();
-      },
-      featureName,
-      licenseType
-    );
-  };
-
   const notifyFeatureUsage = async (featureName: string, lastUsed: number) => {
     await browser.executeAsync(
       async (feature, time, cb) => {
@@ -57,12 +44,10 @@ export default function (ftrContext: FtrProviderContext) {
     });
 
     it('allows to register features to the server', async () => {
-      await registerFeature('test-client-A', 'gold');
-      await registerFeature('test-client-B', 'enterprise');
-
       const response = await supertest.get('/api/licensing/feature_usage').expect(200);
       const features = response.body.features.map(({ name }: FeatureUsage) => name);
 
+      // These were registered by the plugin in ../plugins/test_feature_usage
       expect(features).to.contain('test-client-A');
       expect(features).to.contain('test-client-B');
     });