From 839e89aeb435ff4ff3bcbb36a0e9e642b03cb043 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 14 Apr 2022 12:11:59 +0200
Subject: [PATCH] [Discover] Unskip security tests (#130083)

(cherry picked from commit 37ebf93c027f5159513b9213171d638f9360e6af)
---
 .../overview/__snapshots__/overview.test.tsx.snap    |  1 +
 .../public/components/overview/overview.tsx          |  1 +
 .../discover/feature_controls/discover_security.ts   |  3 +--
 .../discover/feature_controls/discover_spaces.ts     | 12 ++++++------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
index 1a52bf05b9238..37bb37a21c201 100644
--- a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
@@ -682,6 +682,7 @@ exports[`Overview when there is no user data view 1`] = `
       Object {
         "actions": Object {
           "elasticAgent": Object {
+            "data-test-subj": "kbnOverviewAddIntegrations",
             "description": "Use Elastic Agent or Beats to collect data and build out Analytics solutions.",
             "title": "Add integrations",
           },
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx
index b387715710ce4..9d403ac167e6b 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx
@@ -98,6 +98,7 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
           defaultMessage:
             'Use Elastic Agent or Beats to collect data and build out Analytics solutions.',
         }),
+        'data-test-subj': 'kbnOverviewAddIntegrations',
       },
     },
     docsLink: docLinks.links.kibana.guide,
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
index 7032f25debb8f..0a12de3fb44d6 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -31,8 +31,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/106631
-  describe.skip('discover feature controls security', () => {
+  describe('discover feature controls security', () => {
     before(async () => {
       await kibanaServer.importExport.load(
         'x-pack/test/functional/fixtures/kbn_archiver/discover/feature_controls/security'
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
index 936dd49255205..9adcfc552031c 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
@@ -28,14 +28,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/113067
-  describe.skip('spaces', () => {
+  describe('spaces', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/60559
-    describe.skip('space with no features disabled', () => {
+    describe('space with no features disabled', () => {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
@@ -174,13 +172,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await spacesService.delete('custom_space_no_index_patterns');
       });
 
-      it('Navigates to Kibana home rather than index pattern management when no index patterns exist', async () => {
+      it('Navigates to Kibana Analytics overview  when no data views exist', async () => {
         await PageObjects.common.navigateToUrl('discover', '', {
           basePath: '/s/custom_space_no_index_patterns',
           ensureCurrentUrl: false,
           shouldUseHashForSubUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', { timeout: config.get('timeouts.waitFor') });
+        await testSubjects.existOrFail('kbnOverviewAddIntegrations', {
+          timeout: config.get('timeouts.waitFor'),
+        });
       });
     });
   });