From 50d47a2ed5388795166e7f2555cb216448d99ba1 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 10 Jun 2020 08:01:01 +0200
Subject: [PATCH 1/2] adapt some snapshot test (#68489)

---
 .../saved_objects_table.test.tsx.snap         | 132 ------------------
 .../saved_objects_table.test.tsx              |   4 +-
 2 files changed, 2 insertions(+), 134 deletions(-)

diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 707e65d60870c3..f7d5cc760f1bbf 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -197,138 +197,6 @@ exports[`SavedObjectsTable export should allow the user to choose when exporting
 </EuiModal>
 `;
 
-exports[`SavedObjectsTable import should show the flyout 1`] = `
-<Flyout
-  allowedTypes={
-    Array [
-      "index-pattern",
-      "visualization",
-      "dashboard",
-      "search",
-    ]
-  }
-  close={[Function]}
-  done={[Function]}
-  http={
-    Object {
-      "addLoadingCountSource": [MockFunction],
-      "anonymousPaths": Object {
-        "isAnonymous": [MockFunction],
-        "register": [MockFunction],
-      },
-      "basePath": BasePath {
-        "basePath": "",
-        "get": [Function],
-        "prepend": [Function],
-        "remove": [Function],
-        "serverBasePath": "",
-      },
-      "delete": [MockFunction],
-      "fetch": [MockFunction],
-      "get": [MockFunction],
-      "getLoadingCount$": [MockFunction],
-      "head": [MockFunction],
-      "intercept": [MockFunction],
-      "options": [MockFunction],
-      "patch": [MockFunction],
-      "post": [MockFunction],
-      "put": [MockFunction],
-    }
-  }
-  indexPatterns={
-    Object {
-      "clearCache": [MockFunction],
-      "createField": [MockFunction],
-      "createFieldList": [MockFunction],
-      "ensureDefaultIndexPattern": [MockFunction],
-      "get": [MockFunction],
-      "make": [Function],
-    }
-  }
-  overlays={
-    Object {
-      "banners": Object {
-        "add": [MockFunction],
-        "get$": [MockFunction],
-        "getComponent": [MockFunction],
-        "remove": [MockFunction],
-        "replace": [MockFunction],
-      },
-      "openConfirm": [MockFunction],
-      "openFlyout": [MockFunction],
-      "openModal": [MockFunction],
-    }
-  }
-  search={
-    Object {
-      "__LEGACY": Object {
-        "esClient": Object {
-          "msearch": [MockFunction],
-          "search": [MockFunction],
-        },
-      },
-      "aggs": Object {
-        "calculateAutoTimeExpression": [Function],
-        "createAggConfigs": [MockFunction],
-        "types": Object {
-          "get": [Function],
-          "getAll": [Function],
-          "getBuckets": [Function],
-          "getMetrics": [Function],
-        },
-      },
-      "getSearchStrategy": [MockFunction],
-      "search": [MockFunction],
-      "searchSource": Object {
-        "create": [MockFunction],
-        "createEmpty": [MockFunction],
-      },
-      "setInterceptor": [MockFunction],
-    }
-  }
-  serviceRegistry={
-    Object {
-      "all": [MockFunction],
-      "get": [MockFunction],
-      "register": [MockFunction],
-    }
-  }
-/>
-`;
-
-exports[`SavedObjectsTable relationships should show the flyout 1`] = `
-<Relationships
-  basePath={
-    BasePath {
-      "basePath": "",
-      "get": [Function],
-      "prepend": [Function],
-      "remove": [Function],
-      "serverBasePath": "",
-    }
-  }
-  canGoInApp={[Function]}
-  close={[Function]}
-  getRelationships={[Function]}
-  goInspectObject={[Function]}
-  savedObject={
-    Object {
-      "id": "2",
-      "meta": Object {
-        "editUrl": "/management/kibana/objects/savedSearches/2",
-        "icon": "search",
-        "inAppUrl": Object {
-          "path": "/discover/2",
-          "uiCapabilitiesPath": "discover.show",
-        },
-        "title": "MySearch",
-      },
-      "type": "search",
-    }
-  }
-/>
-`;
-
 exports[`SavedObjectsTable should render normally 1`] = `
 <EuiPageContent
   horizontalPosition="center"
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index 191bde8b192fd8..e3456240dc340f 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -395,7 +395,7 @@ describe('SavedObjectsTable', () => {
       component.instance().showImportFlyout();
       component.update();
 
-      expect(component.find(Flyout)).toMatchSnapshot();
+      expect(component.find(Flyout).length).toBe(1);
     });
 
     it('should hide the flyout', async () => {
@@ -450,7 +450,7 @@ describe('SavedObjectsTable', () => {
       } as SavedObjectWithMetadata);
       component.update();
 
-      expect(component.find(Relationships)).toMatchSnapshot();
+      expect(component.find(Relationships).length).toBe(1);
       expect(component.state('relationshipObject')).toEqual({
         id: '2',
         type: 'search',

From 204977c6ce9f64ccf524a4cde5b89dce5c921d7e Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Wed, 10 Jun 2020 09:10:23 +0200
Subject: [PATCH 2/2] Partial revert of "Sync Kerberos + Anonymous access tests
 with the latest `security/_authenticate` API (user roles now include roles of
 anonymous user)." (#68624)

---
 .../apis/security/kerberos_login.ts                  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
index 6a93b94920d6dc..8d2e575fad3133 100644
--- a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
+++ b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
@@ -98,8 +98,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('finishing SPNEGO', () => {
-      // Skipped: https://github.com/elastic/kibana/issues/68720
-      it.skip('should properly set cookie and authenticate user', async () => {
+      it('should properly set cookie and authenticate user', async () => {
         const response = await supertest
           .get('/internal/security/me')
           .set('Authorization', `Negotiate ${spnegoToken}`)
@@ -116,14 +115,7 @@ export default function ({ getService }: FtrProviderContext) {
         const sessionCookie = request.cookie(cookies[0])!;
         checkCookieIsSet(sessionCookie);
 
-        const isAnonymousAccessEnabled = (config.get(
-          'esTestCluster.serverArgs'
-        ) as string[]).some((setting) => setting.startsWith('xpack.security.authc.anonymous'));
-
-        // `superuser_anonymous` role is derived from the enabled anonymous access.
-        const expectedUserRoles = isAnonymousAccessEnabled
-          ? ['kibana_admin', 'superuser_anonymous']
-          : ['kibana_admin'];
+        const expectedUserRoles = ['kibana_admin'];
 
         await supertest
           .get('/internal/security/me')