[Archive Migration] x-pack-banners/multispace

scripts/archive_migration_functions.sh

@@ -1,27 +1,13 @@
-#!/bin/bash
-
-# ??? Should we migrate
-#     x-pack/test/functional/es_archives/logstash/example_pipelines
-# !!! No, we've found 0 saved objects that are listed in the standard_list
-# !!! It contains the following saved object(s)
-#     config
-#     space
-
 standard_list="url,index-pattern,query,graph-workspace,tag,visualization,canvas-element,canvas-workpad,dashboard,search,lens,map,cases,uptime-dynamic-settings,osquery-saved-query,osquery-pack,infrastructure-ui-source,metrics-explorer-view,inventory-view,infrastructure-monitoring-log-view,apm-indices"
 
-orig_archive="x-pack/test/functional/es_archives/spaces/multi_space"
-new_archive="x-pack/test/functional/fixtures/kbn_archiver/spaces/multi_space"
+orig_archive="x-pack/test/functional/es_archives/banners/multispace"
+new_archive="x-pack/test/functional/fixtures/kbn_archiver/banners/multi_space"
 
 # newArchives=("x-pack/test/functional/fixtures/kbn_archiver/dashboard/session_in_space")
-# newArchives+=("x-pack/test/functional/fixtures/kbn_archiver/dashboard/session_in_another_space")
 
-testFiles=("x-pack/test/functional/apps/discover/preserve_url.ts")
-testFiles+=("x-pack/test/functional/apps/visualize/preserve_url.ts")
-testFiles+=("x-pack/test/functional/apps/dashboard/group1/preserve_url.ts")
+# testFiles=("x-pack/test/functional/apps/discover/preserve_url.ts")
 
-test_config="x-pack/test/functional/apps/dashboard/group1/config.ts"
-# test_config="x-pack/test/functional/apps/discover/config.ts"
-# test_config="x-pack/test/functional/apps/visualize/config.ts"
+test_config="x-pack/test/banners_functional/config.ts"
 
 list_stragglers() {
 

src/dev/build/tasks/bin/scripts/kibana

@@ -26,4 +26,4 @@ if [ -f "${CONFIG_DIR}/node.options" ]; then
   KBN_NODE_OPTS="$(grep -v ^# < ${CONFIG_DIR}/node.options | xargs)"
 fi
 
-NODE_OPTIONS="--no-warnings --max-http-header-size=65536 $KBN_NODE_OPTS $NODE_OPTIONS" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli/dist" ${@}
+NODE_OPTIONS="--no-warnings --max-http-header-size=65536 $KBN_NODE_OPTS $NODE_OPTIONS" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli/dist" "${@}"

x-pack/plugins/banners/server/ui_settings.test.ts

@@ -13,7 +13,7 @@ const createConfig = (parts: Partial<BannersConfigType> = {}): BannersConfigType
   placement: 'disabled',
   backgroundColor: '#0000',
   textColor: '#FFFFFF',
-  textContent: 'Hello from the banner',
+  textContent: 'some global banner text',
   disableSpaceBanners: false,
   ...parts,
 });
@@ -31,7 +31,9 @@ describe('registerSettings', () => {
     expect(uiSettings.register).toHaveBeenCalledTimes(1);
     expect(uiSettings.register).toHaveBeenCalledWith({
       'banners:placement': expect.any(Object),
-      'banners:textContent': expect.any(Object),
+      'banners:textContent': expect.objectContaining({
+        value: 'some global banner text',
+      }),
       'banners:textColor': expect.any(Object),
       'banners:backgroundColor': expect.any(Object),
     });

x-pack/test/banners_functional/config.ts

@@ -35,7 +35,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       serverArgs: [
         ...kibanaFunctionalConfig.get('kbnTestServer.serverArgs'),
         '--xpack.banners.placement=top',
-        '--xpack.banners.textContent=global_banner_text',
+        '--xpack.banners.textContent="global banner text"',
       ],
     },
   };

x-pack/test/banners_functional/tests/global.ts

@@ -16,7 +16,7 @@ export default function ({ getPageObjects }: FtrProviderContext) {
       await PageObjects.common.navigateToApp('login');
 
       expect(await PageObjects.banners.isTopBannerVisible()).to.eql(true);
-      expect(await PageObjects.banners.getTopBannerText()).to.eql('global_banner_text');
+      expect(await PageObjects.banners.getTopBannerText()).to.eql('global banner text');
     });
   });
 }

x-pack/test/banners_functional/tests/spaces.ts

@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
+  const spacesService = getService('spaces');
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects([
     'common',
@@ -21,14 +21,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('per-spaces banners', () => {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/banners/multispace');
-    });
-
-    after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/banners/multispace');
-    });
-
-    before(async () => {
+      await spacesService.create({
+        id: 'another-space',
+        name: 'Another Space',
+        disabledFeatures: [],
+      });
       await kibanaServer.uiSettings.replace(
         {
           'banners:textContent': 'default space banner text',
@@ -39,6 +36,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expectSpaceSelector: true,
       });
     });
+    after(async () => {
+      await spacesService.delete('another-space');
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
 
     it('displays the space-specific banner within the space', async () => {
       await PageObjects.common.navigateToApp('home');
@@ -51,15 +52,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await PageObjects.common.navigateToApp('home', { basePath: '/s/another-space' });
 
       expect(await PageObjects.banners.isTopBannerVisible()).to.eql(true);
-      expect(await PageObjects.banners.getTopBannerText()).to.eql('global_banner_text');
+      expect(await PageObjects.banners.getTopBannerText()).to.eql('global banner text');
     });
 
     it('displays the global banner on the login page', async () => {
       await PageObjects.security.forceLogout();
       await PageObjects.common.navigateToApp('login');
 
       expect(await PageObjects.banners.isTopBannerVisible()).to.eql(true);
-      expect(await PageObjects.banners.getTopBannerText()).to.eql('global_banner_text');
+      expect(await PageObjects.banners.getTopBannerText()).to.eql('global banner text');
     });
   });
 }