Merge branch 'master' into implement/ci-stats/metrics-report

elastic · Jun 10, 2020 · 56ade55 · 56ade55
2 parents 47254a8 + 204977c
commit 56ade55
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 144 deletions.
diff --git a/...t/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/...t/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
diff --git a/...d_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/...d_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',

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
@@ -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')