move core provier to NP. allows to run tests on every page (#64929)

* move core provier to NP. allows to run tests on every page * remove no-base-path * pass whole KbnTestServer config * fix build path * another id * np * build kibana tests plugins. it is used in xpack tests Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · May 7, 2020 · 8a33424 · 8a33424
1 parent 4619b47
commit 8a33424
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 60 deletions.
diff --git a/test/plugin_functional/plugins/core_provider_plugin/index.ts b/test/plugin_functional/plugins/core_provider_plugin/index.ts
diff --git a/test/plugin_functional/plugins/core_provider_plugin/kibana.json b/test/plugin_functional/plugins/core_provider_plugin/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "core_provider_plugin",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "optionalPlugins": ["core_plugin_a", "core_plugin_b", "licensing"],
+  "server": false,
+  "ui": true
+}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
@@ -16,13 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { npSetup, npStart } from 'ui/new_platform';
+import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
 import '../types';
 
-window.__coreProvider = {
-  setup: npSetup,
-  start: npStart,
-  testUtils: {
-    delay: (ms: number) => new Promise(res => setTimeout(res, ms)),
-  },
-};
+export const plugin = () => new CoreProviderPlugin();
+
+class CoreProviderPlugin implements Plugin {
+  private setupDeps?: { core: CoreSetup; plugins: Record<string, any> };
+  public setup(core: CoreSetup, plugins: Record<string, any>) {
+    this.setupDeps = {
+      core,
+      plugins,
+    };
+  }
+
+  public start(core: CoreStart, plugins: Record<string, any>) {
+    window.__coreProvider = {
+      setup: this.setupDeps!,
+      start: {
+        core,
+        plugins,
+      },
+      testUtils: {
+        delay: (ms: number) => new Promise(res => setTimeout(res, ms)),
+      },
+    };
+  }
+  public stop() {}
+}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
@@ -8,7 +8,7 @@
     "index.ts",
     "types.ts",
     "public/**/*.ts",
-    "../../../../typings/**/*",
+    "../../../../typings/**/*"
   ],
   "exclude": []
 }
diff --git a/test/plugin_functional/plugins/core_provider_plugin/types.ts b/test/plugin_functional/plugins/core_provider_plugin/types.ts
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { LegacyCoreSetup, LegacyCoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from 'kibana/public';
 
 declare global {
   interface Window {
     __coreProvider: {
       setup: {
-        core: LegacyCoreSetup;
+        core: CoreSetup;
         plugins: Record<string, any>;
       };
       start: {
-        core: LegacyCoreStart;
+        core: CoreStart;
         plugins: Record<string, any>;
       };
       testUtils: {

diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@@ -47,14 +47,6 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
         await PageObjects.common.navigateToApp('settings');
       });
 
-      it('to injectedMetadata service', async () => {
-        expect(
-          await browser.execute(() => {
-            return window.__coreProvider.setup.core.injectedMetadata.getKibanaBuildNumber();
-          })
-        ).to.be.a('number');
-      });
-
       it('to start services via coreSetup.getStartServices', async () => {
         expect(
           await browser.executeAsync(async cb => {

diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh
@@ -5,6 +5,7 @@ source src/dev/ci_setup/setup_env.sh
 
 echo " -> building kibana platform plugins"
 node scripts/build_kibana_platform_plugins \
+  --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
   --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \

diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
@@ -146,9 +146,6 @@ export default async function({ readConfigFile }) {
       uptime: {
         pathname: '/app/uptime',
       },
-      apm: {
-        pathname: '/app/apm',
-      },
       ml: {
         pathname: '/app/ml',
       },

diff --git a/x-pack/test/licensing_plugin/config.public.ts b/x-pack/test/licensing_plugin/config.public.ts
@@ -14,9 +14,9 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
     ...commonConfig.getAll(),
     testFiles: [require.resolve('./public')],
     kbnTestServer: {
+      ...commonConfig.get('kbnTestServer'),
       serverArgs: [
         ...commonConfig.get('kbnTestServer.serverArgs'),
-
         // Required to load new platform plugin provider via `--plugin-path` flag.
         '--env.name=development',
         `--plugin-path=${path.resolve(