Update to account for access/feature control test fixes

cee-chen · Jul 7, 2020 · 5cae7a1 · 5cae7a1
1 parent 52e100d
commit 5cae7a1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -76,8 +76,8 @@ export class EnterpriseSearchPlugin implements Plugin {
       order: 0,
       icon: 'logoEnterpriseSearch',
       navLinkId: 'app_search', // TODO - remove this once functional tests no longer rely on navLinkId
-      app: ['kibana', 'app_search'], // TODO: 'enterprise_search', 'workplace_search'
-      catalogue: ['app_search'], // TODO: 'enterprise_search', 'workplace_search'
+      app: ['kibana', 'app_search', 'workplace_search'], // TODO: 'enterprise_search'
+      catalogue: ['app_search', 'workplace_search'], // TODO: 'enterprise_search'
       privileges: null,
     });
 

diff --git a/x-pack/test/ui_capabilities/common/nav_links_builder.ts b/x-pack/test/ui_capabilities/common/nav_links_builder.ts
@@ -19,6 +19,9 @@ export class NavLinksBuilder {
       app_search: {
         navLinkId: 'app_search',
       },
+      workplace_search: {
+        navLinkId: 'workplace_search',
+      },
     };
   }
 

diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
@@ -50,9 +50,10 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('catalogue');
             // everything except ml and monitoring and enterprise search is enabled
+            const exceptions = ['ml', 'monitoring', 'app_search', 'workplace_search'];
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
-              (enabled, catalogueId) => !['ml', 'monitoring', 'app_search'].includes(catalogueId)
+              (enabled, catalogueId) => !exceptions.includes(catalogueId)
             );
             expect(uiCapabilities.value!.catalogue).to.eql(expected);
             break;

diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts
@@ -51,7 +51,13 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('navLinks');
             expect(uiCapabilities.value!.navLinks).to.eql(
-              navLinksBuilder.except('ml', 'monitoring', 'enterprise_search', 'app_search')
+              navLinksBuilder.except(
+                'ml',
+                'monitoring',
+                'enterprise_search',
+                'app_search',
+                'workplace_search'
+              )
             );
             break;
           case 'superuser at nothing_space':

diff --git a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
@@ -48,9 +48,10 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('catalogue');
             // everything except ml and monitoring and enterprise_search is enabled
+            const exceptions = ['ml', 'monitoring', 'app_search', 'workplace_search'];
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
-              (enabled, catalogueId) => !['ml', 'monitoring', 'app_search'].includes(catalogueId)
+              (enabled, catalogueId) => !exceptions.includes(catalogueId)
             );
             expect(uiCapabilities.value!.catalogue).to.eql(expected);
             break;

diff --git a/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts b/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts
@@ -49,7 +49,7 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('navLinks');
             expect(uiCapabilities.value!.navLinks).to.eql(
-              navLinksBuilder.except('ml', 'monitoring', 'app_search')
+              navLinksBuilder.except('ml', 'monitoring', 'app_search', 'workplace_search')
             );
             break;
           case 'foo_all':