Merge branch 'master' into uptime_np-routing

Author: justinkambic

test/functional/services/remote/webdriver.ts

@@ -136,6 +136,20 @@ async function attemptToCreateCommand(
           // See: https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode
           firefoxOptions.headless();
         }
+
+        // Windows issue with stout socket https://github.com/elastic/kibana/issues/52053
+        if (process.platform === 'win32') {
+          const session = await new Builder()
+            .forBrowser(browserType)
+            .setFirefoxOptions(firefoxOptions)
+            .setFirefoxService(new firefox.ServiceBuilder(geckoDriver.path))
+            .build();
+          return {
+            session,
+            consoleLog$: Rx.EMPTY,
+          };
+        }
+
         const { input, chunk$, cleanup } = await createStdoutSocket();
         lifecycle.on('cleanup', cleanup);
 

x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap

@@ -6,6 +6,7 @@
 
 import { shallowWithIntl, renderWithIntl } from 'test_utils/enzyme_helpers';
 import React from 'react';
+import moment from 'moment';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { MostRecentError } from '../most_recent_error';
 import { MonitorDetails, MonitorError } from '../../../../../../common/runtime_types';
@@ -14,6 +15,10 @@ describe('MostRecentError component', () => {
   let monitorDetails: MonitorDetails;
   let monitorError: MonitorError;
 
+  beforeAll(() => {
+    moment.prototype.fromNow = jest.fn(() => '5 days ago');
+  });
+
   beforeEach(() => {
     monitorError = {
       type: 'io',
@@ -39,7 +44,7 @@ describe('MostRecentError component', () => {
     expect(component).toMatchSnapshot();
   });
 
-  it.skip('renders properly with empty data', () => {
+  it('renders properly with mock data', () => {
     const component = renderWithIntl(
       <Router>
         <MostRecentError

x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/most_recent_error.test.tsx

@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SpacesService, SecurityService } from '../../../common/services';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { isCustomRoleSpecification } from '../../common/types';
 import { Spaces, Users } from '../scenarios';
@@ -14,8 +13,8 @@ export default function alertingApiIntegrationTests({
   loadTestFile,
   getService,
 }: FtrProviderContext) {
-  const securityService: SecurityService = getService('security');
-  const spacesService: SpacesService = getService('spaces');
+  const securityService = getService('security');
+  const spacesService = getService('spaces');
   const esArchiver = getService('esArchiver');
 
   describe('alerting api integration security and spaces enabled', function() {

x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts

@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SpacesService } from '../../../common/services';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { Spaces } from '../scenarios';
 
@@ -13,7 +12,7 @@ export default function alertingApiIntegrationTests({
   loadTestFile,
   getService,
 }: FtrProviderContext) {
-  const spacesService: SpacesService = getService('spaces');
+  const spacesService = getService('spaces');
   const esArchiver = getService('esArchiver');
 
   describe('alerting api integration spaces only', function() {

x-pack/test/alerting_api_integration/spaces_only/tests/index.ts

@@ -5,14 +5,13 @@
  */
 
 import expect from '@kbn/expect';
-import { SecurityService, SpacesService } from '../../../common/services';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const security: SecurityService = getService('security');
-  const spaces: SpacesService = getService('spaces');
+  const security = getService('security');
+  const spaces = getService('spaces');
   const log = getService('log');
 
   const start = encodeURIComponent(new Date(Date.now() - 10000).toISOString());

x-pack/test/api_integration/apis/apm/feature_controls.ts

@@ -4,13 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SecurityService, SpacesService } from '../../../common/services';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function securityTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
-  const security: SecurityService = getService('security');
-  const spaces: SpacesService = getService('spaces');
+  const security = getService('security');
+  const spaces = getService('spaces');
 
   describe('/api/console/proxy', () => {
     it('cannot be accessed by an anonymous user', async () => {

x-pack/test/api_integration/apis/console/feature_controls.ts

@@ -5,15 +5,14 @@
  */
 
 import expect from '@kbn/expect';
-import { SecurityService } from '../../../../common/services';
 import { Feature } from '../../../../../plugins/features/server';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const security: SecurityService = getService('security');
+  const security = getService('security');
 
   describe('/api/features', () => {
     describe('with the "global all" privilege', () => {

x-pack/test/api_integration/apis/features/features/features.ts

@@ -6,7 +6,6 @@
 
 import expect from '@kbn/expect';
 import gql from 'graphql-tag';
-import { SecurityService, SpacesService } from '../../../common/services';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const introspectionQuery = gql`
@@ -21,8 +20,8 @@ const introspectionQuery = gql`
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
-  const security: SecurityService = getService('security');
-  const spaces: SpacesService = getService('spaces');
+  const security = getService('security');
+  const spaces = getService('spaces');
   const clientFactory = getService('infraOpsGraphQLClientFactory');
 
   const expectGraphQL404 = (result: any) => {

x-pack/test/api_integration/apis/infra/feature_controls.ts

@@ -6,13 +6,12 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { SecurityService, SpacesService } from '../../../../common/services';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest: SuperTest<any> = getService('supertestWithoutAuth');
-  const security: SecurityService = getService('security');
-  const spaces: SpacesService = getService('spaces');
+  const security = getService('security');
+  const spaces = getService('spaces');
 
   const expect403 = (result: any) => {
     expect(result.error).to.be(undefined);