diff --git a/.eslintrc.js b/.eslintrc.js index 5ff1aba1f3ff7d..c821bfd5a24044 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -186,8 +186,10 @@ module.exports = { 'x-pack/legacy/plugins/apm/**/*.js', 'test/*/config.ts', 'test/visual_regression/tests/**/*', - 'x-pack/test/visual_regression/tests/**/*', - 'x-pack/test/*/config.ts', + 'x-pack/test/*/{tests,test_suites,apis,apps}/**/*', + 'x-pack/test/*/*config.*ts', + 'x-pack/test/saved_object_api_integration/*/apis/**/*', + 'x-pack/test/ui_capabilities/*/tests/**/*', ], rules: { 'import/no-default-export': 'off', diff --git a/test/api_integration/config.js b/test/api_integration/config.js index 443dc2ab7a68b9..d14630f932bf69 100644 --- a/test/api_integration/config.js +++ b/test/api_integration/config.js @@ -17,11 +17,7 @@ * under the License. */ -import { - KibanaSupertestProvider, - ElasticsearchSupertestProvider, - ChanceProvider, -} from './services'; +import { services } from './services'; export default async function ({ readConfigFile }) { const commonConfig = await readConfigFile(require.resolve('../common/config')); @@ -31,14 +27,7 @@ export default async function ({ readConfigFile }) { testFiles: [ require.resolve('./apis'), ], - services: { - es: commonConfig.get('services.es'), - esArchiver: commonConfig.get('services.esArchiver'), - retry: commonConfig.get('services.retry'), - supertest: KibanaSupertestProvider, - esSupertest: ElasticsearchSupertestProvider, - chance: ChanceProvider, - }, + services, servers: commonConfig.get('servers'), junit: { reportName: 'API Integration Tests' diff --git a/test/api_integration/services/index.js b/test/api_integration/services/index.ts similarity index 63% rename from test/api_integration/services/index.js rename to test/api_integration/services/index.ts index 2d363d1ac552ba..d0fcd94a6a2047 100644 --- a/test/api_integration/services/index.js +++ b/test/api_integration/services/index.ts @@ -17,5 +17,19 @@ * under the License. */ -export { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest'; -export { ChanceProvider } from './chance'; +import { services as commonServices } from '../../common/services'; + +// @ts-ignore not TS yet +import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest'; + +// @ts-ignore not TS yet +import { ChanceProvider } from './chance'; + +export const services = { + es: commonServices.es, + esArchiver: commonServices.esArchiver, + retry: commonServices.retry, + supertest: KibanaSupertestProvider, + esSupertest: ElasticsearchSupertestProvider, + chance: ChanceProvider, +}; diff --git a/test/types/mocha_decorations.d.ts b/test/mocha_decorations.d.ts similarity index 100% rename from test/types/mocha_decorations.d.ts rename to test/mocha_decorations.d.ts diff --git a/test/types/index.ts b/test/types/index.ts deleted file mode 100644 index edfaeb5743524b..00000000000000 --- a/test/types/index.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export * from './mocha_decorations'; diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts index c0d28f7d0ce4b0..7eefbe46175b23 100644 --- a/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts +++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function emailTest({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function emailTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts index 82543d778ffe84..86fe8222678a06 100644 --- a/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts +++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts @@ -6,12 +6,11 @@ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; const ES_TEST_INDEX_NAME = 'functional-test-actions-index'; -// eslint-disable-next-line import/no-default-export -export default function indexTest({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function indexTest({ getService }: FtrProviderContext) { const es = getService('es'); const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts index 3f90c69dd73852..6f2e1c46d29686 100644 --- a/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts +++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function serverLogTest({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function serverLogTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts index 84af82a32ea238..4eea6adb675895 100644 --- a/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts +++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts @@ -6,12 +6,11 @@ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; import { SLACK_ACTION_SIMULATOR_URI } from '../../../fixtures/plugins/actions'; -// eslint-disable-next-line import/no-default-export -export default function slackTest({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function slackTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/create.ts b/x-pack/test/api_integration/apis/actions/create.ts index d7df3fd97c6968..a443cab072c5be 100644 --- a/x-pack/test/api_integration/apis/actions/create.ts +++ b/x-pack/test/api_integration/apis/actions/create.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createActionTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function createActionTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/delete.ts b/x-pack/test/api_integration/apis/actions/delete.ts index 68f8924010cce1..25d6c06ace2afc 100644 --- a/x-pack/test/api_integration/apis/actions/delete.ts +++ b/x-pack/test/api_integration/apis/actions/delete.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function deleteActionTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function deleteActionTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/find.ts b/x-pack/test/api_integration/apis/actions/find.ts index 66a5e956db919b..dafb9d1eaeaf13 100644 --- a/x-pack/test/api_integration/apis/actions/find.ts +++ b/x-pack/test/api_integration/apis/actions/find.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function findActionTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function findActionTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/fire.ts b/x-pack/test/api_integration/apis/actions/fire.ts index 60fe0d5f3dc61b..8bdf0abd9fe1ea 100644 --- a/x-pack/test/api_integration/apis/actions/fire.ts +++ b/x-pack/test/api_integration/apis/actions/fire.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/api_integration/apis/actions/get.ts b/x-pack/test/api_integration/apis/actions/get.ts index 1b34b16c0ea078..be8df1fe076eab 100644 --- a/x-pack/test/api_integration/apis/actions/get.ts +++ b/x-pack/test/api_integration/apis/actions/get.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function getActionTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function getActionTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/actions/index.ts b/x-pack/test/api_integration/apis/actions/index.ts index 7f1f646ab041cc..9a1a21cf29676c 100644 --- a/x-pack/test/api_integration/apis/actions/index.ts +++ b/x-pack/test/api_integration/apis/actions/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function actionsTests({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function actionsTests({ loadTestFile }: FtrProviderContext) { describe('Actions', () => { loadTestFile(require.resolve('./create')); loadTestFile(require.resolve('./delete')); diff --git a/x-pack/test/api_integration/apis/actions/list_action_types.ts b/x-pack/test/api_integration/apis/actions/list_action_types.ts index b1ce39d788c245..b9b04975138b5c 100644 --- a/x-pack/test/api_integration/apis/actions/list_action_types.ts +++ b/x-pack/test/api_integration/apis/actions/list_action_types.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function listActionTypesTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function listActionTypesTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('list_action_types', () => { diff --git a/x-pack/test/api_integration/apis/actions/update.ts b/x-pack/test/api_integration/apis/actions/update.ts index 24b73ab723d98e..b077ca57ef015d 100644 --- a/x-pack/test/api_integration/apis/actions/update.ts +++ b/x-pack/test/api_integration/apis/actions/update.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function updateActionTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function updateActionTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/alerting/alerts.ts b/x-pack/test/api_integration/apis/alerting/alerts.ts index 7b4232f266e20e..6f1582eff42b64 100644 --- a/x-pack/test/api_integration/apis/alerting/alerts.ts +++ b/x-pack/test/api_integration/apis/alerting/alerts.ts @@ -6,11 +6,10 @@ import expect from '@kbn/expect'; import { getTestAlertData, setupEsTestIndex, destroyEsTestIndex } from './utils'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -// eslint-disable-next-line import/no-default-export -export default function alertTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function alertTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/api_integration/apis/alerting/create.ts b/x-pack/test/api_integration/apis/alerting/create.ts index 5923081a5f137e..356501f425dff7 100644 --- a/x-pack/test/api_integration/apis/alerting/create.ts +++ b/x-pack/test/api_integration/apis/alerting/create.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { getTestAlertData } from './utils'; import { ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createAlertTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function createAlertTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/api_integration/apis/alerting/delete.ts b/x-pack/test/api_integration/apis/alerting/delete.ts index 52e8ee4a9d8a58..ec661cac555433 100644 --- a/x-pack/test/api_integration/apis/alerting/delete.ts +++ b/x-pack/test/api_integration/apis/alerting/delete.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { getTestAlertData } from './utils'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createDeleteTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function createDeleteTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/api_integration/apis/alerting/disable.ts b/x-pack/test/api_integration/apis/alerting/disable.ts index a1dae1efa5bbe1..f73398674bb876 100644 --- a/x-pack/test/api_integration/apis/alerting/disable.ts +++ b/x-pack/test/api_integration/apis/alerting/disable.ts @@ -5,12 +5,9 @@ */ import { getTestAlertData } from './utils'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createDisableAlertTests({ - getService, -}: KibanaFunctionalTestDefaultProviders) { +export default function createDisableAlertTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/alerting/enable.ts b/x-pack/test/api_integration/apis/alerting/enable.ts index b91084aaa854d4..da58080499c66b 100644 --- a/x-pack/test/api_integration/apis/alerting/enable.ts +++ b/x-pack/test/api_integration/apis/alerting/enable.ts @@ -5,12 +5,9 @@ */ import { getTestAlertData } from './utils'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createEnableAlertTests({ - getService, -}: KibanaFunctionalTestDefaultProviders) { +export default function createEnableAlertTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/alerting/find.ts b/x-pack/test/api_integration/apis/alerting/find.ts index d438291ee212e4..59b9a42490fe5d 100644 --- a/x-pack/test/api_integration/apis/alerting/find.ts +++ b/x-pack/test/api_integration/apis/alerting/find.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { getTestAlertData } from './utils'; import { ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createFindTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function createFindTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/alerting/get.ts b/x-pack/test/api_integration/apis/alerting/get.ts index bb39c38a64e21f..8f2dffe37e335c 100644 --- a/x-pack/test/api_integration/apis/alerting/get.ts +++ b/x-pack/test/api_integration/apis/alerting/get.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { getTestAlertData } from './utils'; import { ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createGetTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function createGetTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/alerting/index.ts b/x-pack/test/api_integration/apis/alerting/index.ts index baa284777680c2..b613edca8a1152 100644 --- a/x-pack/test/api_integration/apis/alerting/index.ts +++ b/x-pack/test/api_integration/apis/alerting/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function alertingTests({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function alertingTests({ loadTestFile }: FtrProviderContext) { describe('Alerting', () => { loadTestFile(require.resolve('./create')); loadTestFile(require.resolve('./delete')); diff --git a/x-pack/test/api_integration/apis/alerting/list_alert_types.ts b/x-pack/test/api_integration/apis/alerting/list_alert_types.ts index 033f0ec66cf8e8..85c3664303e1ac 100644 --- a/x-pack/test/api_integration/apis/alerting/list_alert_types.ts +++ b/x-pack/test/api_integration/apis/alerting/list_alert_types.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function listAlertTypes({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function listAlertTypes({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('list_alert_types', () => { diff --git a/x-pack/test/api_integration/apis/alerting/update.ts b/x-pack/test/api_integration/apis/alerting/update.ts index b08489fcef3b7c..9ab30bbdc33e01 100644 --- a/x-pack/test/api_integration/apis/alerting/update.ts +++ b/x-pack/test/api_integration/apis/alerting/update.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { getTestAlertData } from './utils'; import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function createUpdateTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function createUpdateTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/apm/feature_controls.ts b/x-pack/test/api_integration/apis/apm/feature_controls.ts index d2a0f9f4ba3341..23cbd0ec54c3b1 100644 --- a/x-pack/test/api_integration/apis/apm/feature_controls.ts +++ b/x-pack/test/api_integration/apis/apm/feature_controls.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { SecurityService, SpacesService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function featureControlsTests({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); diff --git a/x-pack/test/api_integration/apis/apm/index.ts b/x-pack/test/api_integration/apis/apm/index.ts index b51432f10d1e92..6364c7304118ff 100644 --- a/x-pack/test/api_integration/apis/apm/index.ts +++ b/x-pack/test/api_integration/apis/apm/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function apmApiIntegrationTests({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function apmApiIntegrationTests({ loadTestFile }: FtrProviderContext) { describe('APM', () => { loadTestFile(require.resolve('./feature_controls')); }); diff --git a/x-pack/test/api_integration/apis/code/feature_controls.ts b/x-pack/test/api_integration/apis/code/feature_controls.ts index 7cb41fefb25293..0b5c7984f8cc5c 100644 --- a/x-pack/test/api_integration/apis/code/feature_controls.ts +++ b/x-pack/test/api_integration/apis/code/feature_controls.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { SecurityService, SpacesService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function featureControlsTests({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); diff --git a/x-pack/test/api_integration/apis/code/index.ts b/x-pack/test/api_integration/apis/code/index.ts index 551b64bab64c48..68f15c318a72d2 100644 --- a/x-pack/test/api_integration/apis/code/index.ts +++ b/x-pack/test/api_integration/apis/code/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function apmApiIntegrationTests({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function apmApiIntegrationTests({ loadTestFile }: FtrProviderContext) { describe('Code', () => { loadTestFile(require.resolve('./feature_controls')); loadTestFile(require.resolve('./repo_status')); diff --git a/x-pack/test/api_integration/apis/code/repo_status.ts b/x-pack/test/api_integration/apis/code/repo_status.ts index 3af1595ecc1a4c..9f3addf86aca4a 100644 --- a/x-pack/test/api_integration/apis/code/repo_status.ts +++ b/x-pack/test/api_integration/apis/code/repo_status.ts @@ -5,14 +5,13 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { RepoFileStatus, StatusReport, } from '../../../../legacy/plugins/code/common/repo_file_status'; -// eslint-disable-next-line import/no-default-export -export default function repoStatusTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function repoStatusTests({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const retry = getService('retry'); const log = getService('log'); diff --git a/x-pack/test/api_integration/apis/console/feature_controls.ts b/x-pack/test/api_integration/apis/console/feature_controls.ts index 615883d1fbbddd..bf3aa43958aa43 100644 --- a/x-pack/test/api_integration/apis/console/feature_controls.ts +++ b/x-pack/test/api_integration/apis/console/feature_controls.ts @@ -5,10 +5,9 @@ */ import { SecurityService, SpacesService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function securityTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function securityTests({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); diff --git a/x-pack/test/api_integration/apis/console/index.ts b/x-pack/test/api_integration/apis/console/index.ts index 512852a367beab..fb92cbedf3787e 100644 --- a/x-pack/test/api_integration/apis/console/index.ts +++ b/x-pack/test/api_integration/apis/console/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function consoleApiIntegrationTests({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function consoleApiIntegrationTests({ loadTestFile }: FtrProviderContext) { describe('console', () => { loadTestFile(require.resolve('./feature_controls')); }); diff --git a/x-pack/test/api_integration/apis/infra/feature_controls.ts b/x-pack/test/api_integration/apis/infra/feature_controls.ts index 4f4899e86a01bc..44477b09986b9a 100644 --- a/x-pack/test/api_integration/apis/infra/feature_controls.ts +++ b/x-pack/test/api_integration/apis/infra/feature_controls.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import gql from 'graphql-tag'; import { SecurityService, SpacesService } from '../../../common/services'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const introspectionQuery = gql` query Schema { @@ -19,7 +19,7 @@ const introspectionQuery = gql` } `; -const featureControlsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); @@ -291,7 +291,4 @@ const featureControlsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default featureControlsTests; +} diff --git a/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts b/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts index 29fdd0fd48231d..5d1a519efb5b9c 100644 --- a/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts +++ b/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts @@ -5,10 +5,10 @@ */ import expect from '@kbn/expect'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { IpToHostResponse } from '../../../../legacy/plugins/infra/server/routes/ip_to_hostname'; -const ipToHostNameTest: KbnTestProvider = ({ getService }) => { +export default function ipToHostNameTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); @@ -43,7 +43,4 @@ const ipToHostNameTest: KbnTestProvider = ({ getService }) => { .expect(404); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default ipToHostNameTest; +} diff --git a/x-pack/test/api_integration/apis/infra/log_entries.ts b/x-pack/test/api_integration/apis/infra/log_entries.ts index b3b49c416b9c5e..4020acc00c618e 100644 --- a/x-pack/test/api_integration/apis/infra/log_entries.ts +++ b/x-pack/test/api_integration/apis/infra/log_entries.ts @@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid'; import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared'; import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const KEY_WITHIN_DATA_RANGE = { time: new Date('2018-10-17T19:50:00.000Z').valueOf(), @@ -88,7 +88,7 @@ const logEntriesBetweenQuery = gql` ${sharedFragments.InfraLogEntryFields} `; -const logEntriesTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); const sourceConfigurationService = getService('infraOpsSourceConfiguration'); @@ -333,10 +333,7 @@ const logEntriesTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default logEntriesTests; +} const isSorted = (comparator: (first: Value, second: Value) => number) => ( values: Value[] diff --git a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts index 4ffdb838aa93db..efc1173f9fb906 100644 --- a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts +++ b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts @@ -8,9 +8,9 @@ import expect from '@kbn/expect'; import { ascending, pairs } from 'd3-array'; import gql from 'graphql-tag'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared'; import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; const KEY_BEFORE_START = { time: new Date('2000-01-01T00:00:00.000Z').valueOf(), @@ -29,7 +29,7 @@ const KEY_AFTER_END = { tiebreaker: 0, }; -const logEntryHighlightsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); @@ -238,7 +238,7 @@ const logEntryHighlightsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; +} const logEntryHighlightsQuery = gql` query LogEntryHighlightsQuery( @@ -273,9 +273,6 @@ const logEntryHighlightsQuery = gql` ${sharedFragments.InfraLogEntryHighlightFields} `; -// eslint-disable-next-line import/no-default-export -export default logEntryHighlightsTests; - const isSorted = (comparator: (first: Value, second: Value) => number) => ( values: Value[] ) => pairs(values, comparator).every(order => order <= 0); diff --git a/x-pack/test/api_integration/apis/infra/log_item.ts b/x-pack/test/api_integration/apis/infra/log_item.ts index 191081c88a2ff2..2c1fc73de95959 100644 --- a/x-pack/test/api_integration/apis/infra/log_item.ts +++ b/x-pack/test/api_integration/apis/infra/log_item.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { flyoutItemQuery } from '../../../../legacy/plugins/infra/public/containers/logs/flyout_item.gql_query'; import { FlyoutItemQuery } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const logItemTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); describe('Log Item GraphQL Endpoint', () => { @@ -169,7 +169,4 @@ const logItemTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default logItemTests; +} diff --git a/x-pack/test/api_integration/apis/infra/log_summary.ts b/x-pack/test/api_integration/apis/infra/log_summary.ts index 8731ec78bc3dc2..da8c89f674202f 100644 --- a/x-pack/test/api_integration/apis/infra/log_summary.ts +++ b/x-pack/test/api_integration/apis/infra/log_summary.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { pairs } from 'd3-array'; import gql from 'graphql-tag'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const EARLIEST_TIME_WITH_DATA = new Date('2018-10-17T19:42:22.000Z').valueOf(); const LATEST_TIME_WITH_DATA = new Date('2018-10-17T19:57:21.611Z').valueOf(); @@ -41,7 +41,7 @@ const logSummaryBetweenQuery = gql` } `; -const logSummaryTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); @@ -80,7 +80,4 @@ const logSummaryTests: KbnTestProvider = ({ getService }) => { ).to.equal(true); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default logSummaryTests; +} diff --git a/x-pack/test/api_integration/apis/infra/logs_without_millis.ts b/x-pack/test/api_integration/apis/infra/logs_without_millis.ts index 9c33a6f1aed56b..9cddca4c08a14d 100644 --- a/x-pack/test/api_integration/apis/infra/logs_without_millis.ts +++ b/x-pack/test/api_integration/apis/infra/logs_without_millis.ts @@ -8,9 +8,9 @@ import expect from '@kbn/expect'; import { ascending, pairs } from 'd3-array'; import gql from 'graphql-tag'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared'; import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; const KEY_WITHIN_DATA_RANGE = { time: new Date('2019-01-06T00:00:00.000Z').valueOf(), @@ -25,7 +25,7 @@ const LATEST_KEY_WITH_DATA = { tiebreaker: 2, }; -const logsWithoutMillisTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); @@ -97,10 +97,7 @@ const logsWithoutMillisTests: KbnTestProvider = ({ getService }) => { ).to.have.length(2); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default logsWithoutMillisTests; +} const logEntriesAroundQuery = gql` query LogEntriesAroundQuery( diff --git a/x-pack/test/api_integration/apis/infra/metadata.ts b/x-pack/test/api_integration/apis/infra/metadata.ts index 8c06f2400b9591..546403b8b19349 100644 --- a/x-pack/test/api_integration/apis/infra/metadata.ts +++ b/x-pack/test/api_integration/apis/infra/metadata.ts @@ -10,9 +10,9 @@ import { InfraMetadata, InfraMetadataRequest, } from '../../../../legacy/plugins/infra/common/http_api/metadata_api'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const metadataTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); const fetchMetadata = async (body: InfraMetadataRequest): Promise => { @@ -241,7 +241,4 @@ const metadataTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default metadataTests; +} diff --git a/x-pack/test/api_integration/apis/infra/metrics.ts b/x-pack/test/api_integration/apis/infra/metrics.ts index 985af588eca359..d40359edc5ff23 100644 --- a/x-pack/test/api_integration/apis/infra/metrics.ts +++ b/x-pack/test/api_integration/apis/infra/metrics.ts @@ -9,12 +9,12 @@ import { first, last } from 'lodash'; import { metricsQuery } from '../../../../legacy/plugins/infra/public/containers/metrics/metrics.gql_query'; import { MetricsQuery } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { DATES } from './constants'; const { min, max } = DATES['7.0.0'].hosts; -const metricTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); @@ -75,7 +75,4 @@ const metricTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default metricTests; +} diff --git a/x-pack/test/api_integration/apis/infra/metrics_explorer.ts b/x-pack/test/api_integration/apis/infra/metrics_explorer.ts index 8c4922518d042a..ee81b665adbe61 100644 --- a/x-pack/test/api_integration/apis/infra/metrics_explorer.ts +++ b/x-pack/test/api_integration/apis/infra/metrics_explorer.ts @@ -9,11 +9,11 @@ import { first } from 'lodash'; import moment from 'moment'; import { DATES } from './constants'; import { MetricsExplorerResponse } from '../../../../legacy/plugins/infra/server/routes/metrics_explorer/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const { min, max } = DATES['7.0.0'].hosts; -const metricsExplorerTest: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); @@ -259,7 +259,4 @@ const metricsExplorerTest: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default metricsExplorerTest; +} diff --git a/x-pack/test/api_integration/apis/infra/sources.ts b/x-pack/test/api_integration/apis/infra/sources.ts index c553e2f5c7bc7f..8e51610d208be2 100644 --- a/x-pack/test/api_integration/apis/infra/sources.ts +++ b/x-pack/test/api_integration/apis/infra/sources.ts @@ -13,10 +13,10 @@ import { sourceStatusFieldsFragment, } from '../../../../legacy/plugins/infra/public/containers/source/source_fields_fragment.gql_query'; import { SourceQuery } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared'; -const sourcesTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); @@ -383,10 +383,7 @@ const sourcesTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default sourcesTests; +} const createSourceMutation = gql` mutation createSource($sourceId: ID!, $sourceProperties: UpdateSourceInput!) { diff --git a/x-pack/test/api_integration/apis/infra/types.ts b/x-pack/test/api_integration/apis/infra/types.ts deleted file mode 100644 index 0011feb201da3a..00000000000000 --- a/x-pack/test/api_integration/apis/infra/types.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { InMemoryCache } from 'apollo-cache-inmemory'; -import { ApolloClient } from 'apollo-client'; - -import { - UpdateSourceInput, - UpdateSourceResult, -} from '../../../../legacy/plugins/infra/public/graphql/types'; - -export interface EsArchiver { - load(name: string): void; - unload(name: string): void; -} - -interface InfraOpsGraphQLClientFactoryOptions { - username: string; - password: string; - basePath: string; -} - -interface InfraOpsSourceConfigurationService { - createConfiguration( - sourceId: string, - sourceProperties: UpdateSourceInput - ): UpdateSourceResult['source']['version']; -} - -export interface KbnTestProviderOptions { - getService(name: string): any; - getService(name: 'esArchiver'): EsArchiver; - getService(name: 'infraOpsGraphQLClient'): ApolloClient; - getService( - name: 'infraOpsGraphQLClientFactory' - ): (options: InfraOpsGraphQLClientFactoryOptions) => ApolloClient; - getService(name: 'infraOpsSourceConfiguration'): InfraOpsSourceConfigurationService; -} - -export type KbnTestProvider = (options: KbnTestProviderOptions) => void; diff --git a/x-pack/test/api_integration/apis/infra/waffle.ts b/x-pack/test/api_integration/apis/infra/waffle.ts index 055fbf91e9f3b2..b7ccce1d6df098 100644 --- a/x-pack/test/api_integration/apis/infra/waffle.ts +++ b/x-pack/test/api_integration/apis/infra/waffle.ts @@ -9,11 +9,11 @@ import { first, last } from 'lodash'; import { waffleNodesQuery } from '../../../../legacy/plugins/infra/public/containers/waffle/waffle_nodes.gql_query'; import { WaffleNodesQuery } from '../../../../legacy/plugins/infra/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { DATES } from './constants'; -const waffleTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('infraOpsGraphQLClient'); @@ -308,7 +308,4 @@ const waffleTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default waffleTests; +} diff --git a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts index 51bd28aaf23436..699a658dc5558b 100644 --- a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts +++ b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { SuperTest } from 'supertest'; import { SecurityService, SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function featureControlsTests({ getService }: FtrProviderContext) { const supertest: SuperTest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); diff --git a/x-pack/test/api_integration/apis/management/advanced_settings/index.ts b/x-pack/test/api_integration/apis/management/advanced_settings/index.ts index d8722305933ace..d22ba8fc81fca6 100644 --- a/x-pack/test/api_integration/apis/management/advanced_settings/index.ts +++ b/x-pack/test/api_integration/apis/management/advanced_settings/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('advanced settings', () => { loadTestFile(require.resolve('./feature_controls')); }); diff --git a/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts b/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts index 2b0c8c5bc5996a..cf22394a086163 100644 --- a/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts +++ b/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect/expect.js'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Builtin ES Privileges', () => { diff --git a/x-pack/test/api_integration/apis/security/index_fields.ts b/x-pack/test/api_integration/apis/security/index_fields.ts index 41741a79760b00..60c6e800c40b23 100644 --- a/x-pack/test/api_integration/apis/security/index_fields.ts +++ b/x-pack/test/api_integration/apis/security/index_fields.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect/expect.js'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Index Fields', () => { diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts index 9bdec4b97b96e7..843c1b22f0ad89 100644 --- a/x-pack/test/api_integration/apis/security/privileges.ts +++ b/x-pack/test/api_integration/apis/security/privileges.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); let version: string; diff --git a/x-pack/test/api_integration/apis/short_urls/feature_controls.ts b/x-pack/test/api_integration/apis/short_urls/feature_controls.ts index bac06e875a5ec1..7e1b9e7bd9712c 100644 --- a/x-pack/test/api_integration/apis/short_urls/feature_controls.ts +++ b/x-pack/test/api_integration/apis/short_urls/feature_controls.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { SecurityService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function featureControlsTests({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); diff --git a/x-pack/test/api_integration/apis/short_urls/index.ts b/x-pack/test/api_integration/apis/short_urls/index.ts index 8f12c6f2953be1..fdfd31a1901b3f 100644 --- a/x-pack/test/api_integration/apis/short_urls/index.ts +++ b/x-pack/test/api_integration/apis/short_urls/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function shortUrlsApiIntegrationTests({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function shortUrlsApiIntegrationTests({ loadTestFile }: FtrProviderContext) { describe('Short URLs', () => { loadTestFile(require.resolve('./feature_controls')); }); diff --git a/x-pack/test/api_integration/apis/siem/authentications.ts b/x-pack/test/api_integration/apis/siem/authentications.ts index 1ac36d31e43bda..cf9d8d8c9a5155 100644 --- a/x-pack/test/api_integration/apis/siem/authentications.ts +++ b/x-pack/test/api_integration/apis/siem/authentications.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { authenticationsQuery } from '../../../../legacy/plugins/siem/public/containers/authentications/index.gql_query'; import { GetAuthenticationsQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); @@ -18,7 +18,7 @@ const HOST_NAME = 'zeek-newyork-sha-aa8df15'; const TOTAL_COUNT = 3; const EDGE_LENGTH = 1; -const authenticationsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -84,7 +84,4 @@ const authenticationsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default authenticationsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/domains.ts b/x-pack/test/api_integration/apis/siem/domains.ts index 571f2685cf38de..7965feb0e30f43 100644 --- a/x-pack/test/api_integration/apis/siem/domains.ts +++ b/x-pack/test/api_integration/apis/siem/domains.ts @@ -13,13 +13,13 @@ import { FlowTarget, GetDomainsQuery, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); const IP = '10.100.7.196'; -const domainsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Domains', () => { @@ -138,7 +138,4 @@ const domainsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default domainsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/events.ts b/x-pack/test/api_integration/apis/siem/events.ts index 9a4084a66d1c6b..57780f825df87f 100644 --- a/x-pack/test/api_integration/apis/siem/events.ts +++ b/x-pack/test/api_integration/apis/siem/events.ts @@ -14,7 +14,7 @@ import { GetEventsQuery, GetLastEventTimeQuery, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); @@ -24,7 +24,7 @@ const HOST_NAME = 'suricata-sensor-amsterdam'; const TOTAL_COUNT = 1751; const EDGE_LENGTH = 2; -const eventsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('events API', () => { @@ -344,7 +344,4 @@ const eventsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default eventsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/feature_controls.ts b/x-pack/test/api_integration/apis/siem/feature_controls.ts index 1956fa5e562d63..836c35386b332c 100644 --- a/x-pack/test/api_integration/apis/siem/feature_controls.ts +++ b/x-pack/test/api_integration/apis/siem/feature_controls.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import gql from 'graphql-tag'; import { SecurityService, SpacesService } from '../../../common/services'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const introspectionQuery = gql` query Schema { @@ -19,7 +19,7 @@ const introspectionQuery = gql` } `; -const featureControlsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); @@ -237,7 +237,4 @@ const featureControlsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default featureControlsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/hosts.ts b/x-pack/test/api_integration/apis/siem/hosts.ts index 95f05516f0aa04..f9cdb1935a78aa 100644 --- a/x-pack/test/api_integration/apis/siem/hosts.ts +++ b/x-pack/test/api_integration/apis/siem/hosts.ts @@ -16,7 +16,7 @@ import { import { HostOverviewQuery } from '../../../../legacy/plugins/siem/public/containers/hosts/overview/host_overview.gql_query'; import { HostFirstLastSeenGqlQuery } from './../../../../legacy/plugins/siem/public/containers/hosts/first_last_seen/first_last_seen.gql_query'; import { HostsTableQuery } from './../../../../legacy/plugins/siem/public/containers/hosts/hosts_table.gql_query'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); @@ -27,7 +27,7 @@ const TOTAL_COUNT = 7; const EDGE_LENGTH = 1; const CURSOR_ID = '2ab45fc1c41e4c84bbd02202a7e5761f'; -const hostsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -178,7 +178,4 @@ const hostsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default hostsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/ip_overview.ts b/x-pack/test/api_integration/apis/siem/ip_overview.ts index 875cc078a8a64e..bec31a018cac8d 100644 --- a/x-pack/test/api_integration/apis/siem/ip_overview.ts +++ b/x-pack/test/api_integration/apis/siem/ip_overview.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { ipOverviewQuery } from '../../../../legacy/plugins/siem/public/containers/ip_overview/index.gql_query'; import { GetIpOverviewQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const ipOverviewTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('IP Overview', () => { @@ -64,7 +64,4 @@ const ipOverviewTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default ipOverviewTests; +} diff --git a/x-pack/test/api_integration/apis/siem/kpi_host_details.ts b/x-pack/test/api_integration/apis/siem/kpi_host_details.ts index e6090f9678f6a6..02152c0b71ca9e 100644 --- a/x-pack/test/api_integration/apis/siem/kpi_host_details.ts +++ b/x-pack/test/api_integration/apis/siem/kpi_host_details.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { kpiHostDetailsQuery } from '../../../../legacy/plugins/siem/public/containers/kpi_host_details/index.gql_query'; import { GetKpiHostDetailsQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const kpiHostsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Kpi Host Details', () => { @@ -178,6 +178,4 @@ const kpiHostsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; -// eslint-disable-next-line import/no-default-export -export default kpiHostsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/kpi_hosts.ts b/x-pack/test/api_integration/apis/siem/kpi_hosts.ts index 32053c83946403..9e43405b324faa 100644 --- a/x-pack/test/api_integration/apis/siem/kpi_hosts.ts +++ b/x-pack/test/api_integration/apis/siem/kpi_hosts.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { kpiHostsQuery } from '../../../../legacy/plugins/siem/public/containers/kpi_hosts/index.gql_query'; import { GetKpiHostsQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const kpiHostsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Kpi Hosts', () => { @@ -222,6 +222,4 @@ const kpiHostsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; -// eslint-disable-next-line import/no-default-export -export default kpiHostsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/kpi_network.ts b/x-pack/test/api_integration/apis/siem/kpi_network.ts index 7b007c30a7ead9..28cd89a2cc9b87 100644 --- a/x-pack/test/api_integration/apis/siem/kpi_network.ts +++ b/x-pack/test/api_integration/apis/siem/kpi_network.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { kpiNetworkQuery } from '../../../../legacy/plugins/siem/public/containers/kpi_network/index.gql_query'; import { GetKpiNetworkQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const kpiNetworkTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Kpi Network', () => { @@ -176,7 +176,4 @@ const kpiNetworkTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default kpiNetworkTests; +} diff --git a/x-pack/test/api_integration/apis/siem/network_dns.ts b/x-pack/test/api_integration/apis/siem/network_dns.ts index 1851c23aa3492e..db22da59257d66 100644 --- a/x-pack/test/api_integration/apis/siem/network_dns.ts +++ b/x-pack/test/api_integration/apis/siem/network_dns.ts @@ -11,9 +11,9 @@ import { GetNetworkDnsQuery, NetworkDnsFields, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const networkDnsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Network DNS', () => { @@ -93,7 +93,4 @@ const networkDnsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default networkDnsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts b/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts index eedcd986b08997..2aa86dab1a8a8e 100644 --- a/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts +++ b/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts @@ -13,11 +13,11 @@ import { GetNetworkTopNFlowQuery, NetworkTopNFlowFields, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const EDGE_LENGTH = 10; -const networkTopNFlowTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Network Top N Flow', () => { @@ -307,7 +307,4 @@ const networkTopNFlowTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default networkTopNFlowTests; +} diff --git a/x-pack/test/api_integration/apis/siem/overview_host.ts b/x-pack/test/api_integration/apis/siem/overview_host.ts index da0f20772a177e..ef960534f6ce42 100644 --- a/x-pack/test/api_integration/apis/siem/overview_host.ts +++ b/x-pack/test/api_integration/apis/siem/overview_host.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { overviewHostQuery } from '../../../../legacy/plugins/siem/public/containers/overview/overview_host/index.gql_query'; import { GetOverviewHostQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const overviewHostTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Overview Host', () => { @@ -53,7 +53,4 @@ const overviewHostTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default overviewHostTests; +} diff --git a/x-pack/test/api_integration/apis/siem/overview_network.ts b/x-pack/test/api_integration/apis/siem/overview_network.ts index 24ef870b826e64..ce2f8d4a0b5e5f 100644 --- a/x-pack/test/api_integration/apis/siem/overview_network.ts +++ b/x-pack/test/api_integration/apis/siem/overview_network.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { overviewNetworkQuery } from '../../../../legacy/plugins/siem/public/containers/overview/overview_network/index.gql_query'; import { GetOverviewNetworkQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const overviewNetworkTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Overview Network', () => { @@ -137,7 +137,4 @@ const overviewNetworkTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default overviewNetworkTests; +} diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts b/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts index f29043c957b76b..5aa7a10e07c2a4 100644 --- a/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts +++ b/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts @@ -7,11 +7,10 @@ import expect from '@kbn/expect'; import gql from 'graphql-tag'; +import { FtrProviderContext } from '../../../ftr_provider_context'; import { persistTimelineNoteMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/notes/persist.gql_query'; -import { KbnTestProvider } from '../types'; - -const notesPersistenceTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -94,10 +93,7 @@ const notesPersistenceTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default notesPersistenceTests; +} const deleteNoteMutation = gql` mutation DeleteNoteMutation($id: [ID!]!) { diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts b/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts index e0921ed6c84166..f1e926b3ede426 100644 --- a/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts +++ b/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts @@ -6,11 +6,10 @@ import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../ftr_provider_context'; import { persistTimelinePinnedEventMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/pinned_event/persist.gql_query'; -import { KbnTestProvider } from '../types'; - -const pinnedEventsPersistenceTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -62,7 +61,4 @@ const pinnedEventsPersistenceTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default pinnedEventsPersistenceTests; +} diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts index d5062eb022a6dd..a6ced270e21324 100644 --- a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts +++ b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts @@ -12,16 +12,15 @@ import expect from '@kbn/expect'; import ApolloClient from 'apollo-client'; -import { InMemoryCache } from 'apollo-cache-inmemory'; + +import { FtrProviderContext } from '../../../ftr_provider_context'; import { deleteTimelineMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/delete/persist.gql_query'; import { persistTimelineFavoriteMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/favorite/persist.gql_query'; import { persistTimelineMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/persist.gql_query'; import { TimelineResult } from '../../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from '../types'; - -const timelinePersistenceTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -296,10 +295,7 @@ const timelinePersistenceTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default timelinePersistenceTests; +} const omitTypename = (key: string, value: keyof TimelineResult) => key === '__typename' ? undefined : value; @@ -307,7 +303,7 @@ const omitTypename = (key: string, value: keyof TimelineResult) => const omitTypenameInTimeline = (timeline: TimelineResult) => JSON.parse(JSON.stringify(timeline), omitTypename); -const createBasicTimeline = async (client: ApolloClient, titleToSaved: string) => +const createBasicTimeline = async (client: ApolloClient, titleToSaved: string) => await client.mutate({ mutation: persistTimelineMutation, variables: { diff --git a/x-pack/test/api_integration/apis/siem/sources.ts b/x-pack/test/api_integration/apis/siem/sources.ts index ffad618da4ec5c..e96aaefee3ea58 100644 --- a/x-pack/test/api_integration/apis/siem/sources.ts +++ b/x-pack/test/api_integration/apis/siem/sources.ts @@ -8,9 +8,9 @@ import expect from '@kbn/expect'; import { sourceQuery } from '../../../../legacy/plugins/siem/public/containers/source/index.gql_query'; import { SourceQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -const sourcesTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -35,7 +35,4 @@ const sourcesTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default sourcesTests; +} diff --git a/x-pack/test/api_integration/apis/siem/timeline.ts b/x-pack/test/api_integration/apis/siem/timeline.ts index 8ee55ebeb9adb9..a6ab4493448f33 100644 --- a/x-pack/test/api_integration/apis/siem/timeline.ts +++ b/x-pack/test/api_integration/apis/siem/timeline.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { timelineQuery } from '../../../../legacy/plugins/siem/public/containers/timeline/index.gql_query'; import { Direction, GetTimelineQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const LTE = new Date('3000-01-01T00:00:00.000Z').valueOf(); const GTE = new Date('2000-01-01T00:00:00.000Z').valueOf(); @@ -51,7 +51,7 @@ const FILTER_VALUE = { }, }; -const timelineTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -119,7 +119,4 @@ const timelineTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default timelineTests; +} diff --git a/x-pack/test/api_integration/apis/siem/timeline_details.ts b/x-pack/test/api_integration/apis/siem/timeline_details.ts index d59c45c338c8ca..b702adfc1d35eb 100644 --- a/x-pack/test/api_integration/apis/siem/timeline_details.ts +++ b/x-pack/test/api_integration/apis/siem/timeline_details.ts @@ -12,7 +12,7 @@ import { DetailItem, GetTimelineDetailsQuery, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; type DetailsData = Array< Pick & { @@ -298,7 +298,7 @@ const EXPECTED_DATA: DetailItem[] = [ { field: '_score', values: ['1'], originalValue: 1 }, ]; -const timelineDetailsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -329,7 +329,4 @@ const timelineDetailsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default timelineDetailsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/tls.ts b/x-pack/test/api_integration/apis/siem/tls.ts index bd7a9dfd28bae2..aec10cf1f96896 100644 --- a/x-pack/test/api_integration/apis/siem/tls.ts +++ b/x-pack/test/api_integration/apis/siem/tls.ts @@ -12,7 +12,7 @@ import { FlowTarget, GetTlsQuery, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); @@ -29,7 +29,7 @@ const expectedResult = { notAfter: ['2019-05-22T12:00:00.000Z'], }; -const tlsTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Tls Test', () => { @@ -102,7 +102,4 @@ const tlsTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default tlsTests; +} diff --git a/x-pack/test/api_integration/apis/siem/types.ts b/x-pack/test/api_integration/apis/siem/types.ts deleted file mode 100644 index 042d24a24be44b..00000000000000 --- a/x-pack/test/api_integration/apis/siem/types.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { InMemoryCache } from 'apollo-cache-inmemory'; -import { ApolloClient } from 'apollo-client'; - -export interface EsArchiver { - load(name: string): void; - unload(name: string): void; -} - -export interface KbnTestProviderOptions { - getService(name: string): any; - getService(name: 'esArchiver'): EsArchiver; - getService(name: 'siemGraphQLClient'): ApolloClient; -} - -export type KbnTestProvider = (options: KbnTestProviderOptions) => void; diff --git a/x-pack/test/api_integration/apis/siem/uncommon_processes.ts b/x-pack/test/api_integration/apis/siem/uncommon_processes.ts index 0e1ac306348952..6e384ee9c20d56 100644 --- a/x-pack/test/api_integration/apis/siem/uncommon_processes.ts +++ b/x-pack/test/api_integration/apis/siem/uncommon_processes.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { uncommonProcessesQuery } from '../../../../legacy/plugins/siem/public/containers/uncommon_processes/index.gql_query'; import { GetUncommonProcessesQuery } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); @@ -16,7 +16,7 @@ const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); // typical values that have to change after an update from "scripts/es_archiver" const TOTAL_COUNT = 80; -const uncommonProcessesTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); @@ -160,7 +160,4 @@ const uncommonProcessesTests: KbnTestProvider = ({ getService }) => { expect(UncommonProcesses.edges[0].node).to.eql(expected); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default uncommonProcessesTests; +} diff --git a/x-pack/test/api_integration/apis/siem/users.ts b/x-pack/test/api_integration/apis/siem/users.ts index 25ff30c5803a93..f1869d40fbf1d5 100644 --- a/x-pack/test/api_integration/apis/siem/users.ts +++ b/x-pack/test/api_integration/apis/siem/users.ts @@ -12,13 +12,13 @@ import { FlowTarget, GetUsersQuery, } from '../../../../legacy/plugins/siem/public/graphql/types'; -import { KbnTestProvider } from './types'; +import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); const IP = '0.0.0.0'; -const usersTests: KbnTestProvider = ({ getService }) => { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const client = getService('siemGraphQLClient'); describe('Users', () => { @@ -63,7 +63,4 @@ const usersTests: KbnTestProvider = ({ getService }) => { }); }); }); -}; - -// eslint-disable-next-line import/no-default-export -export default usersTests; +} diff --git a/x-pack/test/api_integration/apis/spaces/index.ts b/x-pack/test/api_integration/apis/spaces/index.ts index 1a4df65b0856e5..5aa35a10159f01 100644 --- a/x-pack/test/api_integration/apis/spaces/index.ts +++ b/x-pack/test/api_integration/apis/spaces/index.ts @@ -3,9 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: Record) { +export default function({ loadTestFile }: FtrProviderContext) { describe('spaces', function() { this.tags('ciGroup6'); diff --git a/x-pack/test/api_integration/apis/spaces/saved_objects.ts b/x-pack/test/api_integration/apis/spaces/saved_objects.ts index b08d435627e10a..05f14a50f2170e 100644 --- a/x-pack/test/api_integration/apis/spaces/saved_objects.ts +++ b/x-pack/test/api_integration/apis/spaces/saved_objects.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect/expect.js'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('`space` saved object type', () => { diff --git a/x-pack/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts index fb875dbe048139..1dd9d5ff798c45 100644 --- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts +++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts @@ -7,11 +7,10 @@ import expect from '@kbn/expect'; import { docCountQueryString } from '../../../../legacy/plugins/uptime/public/queries'; import { SecurityService, SpacesService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { PINGS_DATE_RANGE_END, PINGS_DATE_RANGE_START } from './constants'; -// eslint-disable-next-line import/no-default-export -export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function featureControlsTests({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const security: SecurityService = getService('security'); const spaces: SpacesService = getService('spaces'); diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts index 5c7f6179228726..3273661b6c2ab8 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts +++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts @@ -7,9 +7,9 @@ import expect from '@kbn/expect'; import { monitorPageTitleQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_page_title_query'; import monitorPageTitle from './fixtures/monitor_page_title.json'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: { getService: any }) { +export default function({ getService }: FtrProviderContext) { describe('monitorPageTitle', () => { const supertest = getService('supertest'); diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts index 9102afad19bc7f..7e38939673df9e 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts +++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts @@ -6,9 +6,9 @@ import { monitorStatesQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_states_query'; import { expectFixtureEql } from './expect_fixture_eql'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: { getService: any }) { +export default function({ getService }: FtrProviderContext) { describe('monitorStates', () => { const supertest = getService('supertest'); diff --git a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts index 8014d6d815b752..413511bf4a23bb 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts +++ b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts @@ -6,9 +6,9 @@ import { snapshotHistogramQueryString } from '../../../../../legacy/plugins/uptime/public/queries/snapshot_histogram_query'; import { expectFixtureEql } from './expect_fixture_eql'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: { getService: any }) { +export default function({ getService }: FtrProviderContext) { describe('snapshotHistogram', () => { const supertest = getService('supertest'); diff --git a/x-pack/test/api_integration/apis/xpack_main/features/features.ts b/x-pack/test/api_integration/apis/xpack_main/features/features.ts index a3e77fd151e25d..4a650886815969 100644 --- a/x-pack/test/api_integration/apis/xpack_main/features/features.ts +++ b/x-pack/test/api_integration/apis/xpack_main/features/features.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; import { Feature } from '../../../../../legacy/plugins/xpack_main/types'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const supertestWithoutAuth = getService('supertestWithoutAuth'); diff --git a/x-pack/test/api_integration/apis/xpack_main/features/index.ts b/x-pack/test/api_integration/apis/xpack_main/features/index.ts index fdf7abc9cb6225..885f4aad12fcaf 100644 --- a/x-pack/test/api_integration/apis/xpack_main/features/index.ts +++ b/x-pack/test/api_integration/apis/xpack_main/features/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('Features', () => { loadTestFile(require.resolve('./features')); }); diff --git a/x-pack/test/api_integration/config.js b/x-pack/test/api_integration/config.js index 92015be3f0e0c6..cf11f6953b5887 100644 --- a/x-pack/test/api_integration/config.js +++ b/x-pack/test/api_integration/config.js @@ -5,53 +5,17 @@ */ import path from 'path'; -import { - EsProvider, - EsSupertestWithoutAuthProvider, - SupertestWithoutAuthProvider, - UsageAPIProvider, - InfraOpsGraphQLClientProvider, - InfraOpsGraphQLClientFactoryProvider, - SiemGraphQLClientProvider, - SiemGraphQLClientFactoryProvider, - InfraOpsSourceConfigurationProvider, -} from './services'; - -import { - SecurityServiceProvider, - SpacesServiceProvider, -} from '../common/services'; +import { services } from './services'; import { SLACK_ACTION_SIMULATOR_URI } from './fixtures/plugins/actions'; export async function getApiIntegrationConfig({ readConfigFile }) { - - const kibanaAPITestsConfig = await readConfigFile(require.resolve('../../../test/api_integration/config.js')); const xPackFunctionalTestsConfig = await readConfigFile(require.resolve('../functional/config.js')); - const kibanaCommonConfig = await readConfigFile(require.resolve('../../../test/common/config.js')); return { testFiles: [require.resolve('./apis')], + services, servers: xPackFunctionalTestsConfig.get('servers'), - services: { - supertest: kibanaAPITestsConfig.get('services.supertest'), - esSupertest: kibanaAPITestsConfig.get('services.esSupertest'), - supertestWithoutAuth: SupertestWithoutAuthProvider, - esSupertestWithoutAuth: EsSupertestWithoutAuthProvider, - infraOpsGraphQLClient: InfraOpsGraphQLClientProvider, - infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider, - siemGraphQLClientFactory: SiemGraphQLClientFactoryProvider, - siemGraphQLClient: SiemGraphQLClientProvider, - infraOpsSourceConfiguration: InfraOpsSourceConfigurationProvider, - es: EsProvider, - esArchiver: kibanaCommonConfig.get('services.esArchiver'), - usageAPI: UsageAPIProvider, - kibanaServer: kibanaCommonConfig.get('services.kibanaServer'), - chance: kibanaAPITestsConfig.get('services.chance'), - security: SecurityServiceProvider, - spaces: SpacesServiceProvider, - retry: xPackFunctionalTestsConfig.get('services.retry'), - }, esArchiver: xPackFunctionalTestsConfig.get('esArchiver'), junit: { reportName: 'X-Pack API Integration Tests', diff --git a/x-pack/test/api_integration/ftr_provider_context.d.ts b/x-pack/test/api_integration/ftr_provider_context.d.ts new file mode 100644 index 00000000000000..e3add3748f56d7 --- /dev/null +++ b/x-pack/test/api_integration/ftr_provider_context.d.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/api_integration/services/index.js b/x-pack/test/api_integration/services/index.js deleted file mode 100644 index 35ebd9206600d4..00000000000000 --- a/x-pack/test/api_integration/services/index.js +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export { EsProvider } from './es'; -export { EsSupertestWithoutAuthProvider } from './es_supertest_without_auth'; -export { SupertestWithoutAuthProvider } from './supertest_without_auth'; -export { UsageAPIProvider } from './usage_api'; -export { InfraOpsGraphQLClientProvider, InfraOpsGraphQLClientFactoryProvider } from './infraops_graphql_client'; -export { SiemGraphQLClientProvider, SiemGraphQLClientFactoryProvider } from './siem_graphql_client'; -export { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration'; diff --git a/x-pack/test/api_integration/services/index.ts b/x-pack/test/api_integration/services/index.ts new file mode 100644 index 00000000000000..a8d3e2f9de337d --- /dev/null +++ b/x-pack/test/api_integration/services/index.ts @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { services as kibanaApiIntegrationServices } from '../../../../test/api_integration/services'; +import { services as kibanaCommonServices } from '../../../../test/common/services'; + +import { SecurityServiceProvider, SpacesServiceProvider } from '../../common/services'; + +// @ts-ignore not ts yet +import { EsProvider } from './es'; +// @ts-ignore not ts yet +import { EsSupertestWithoutAuthProvider } from './es_supertest_without_auth'; +// @ts-ignore not ts yet +import { SupertestWithoutAuthProvider } from './supertest_without_auth'; +// @ts-ignore not ts yet +import { UsageAPIProvider } from './usage_api'; +import { + InfraOpsGraphQLClientProvider, + InfraOpsGraphQLClientFactoryProvider, +} from './infraops_graphql_client'; +import { SiemGraphQLClientProvider, SiemGraphQLClientFactoryProvider } from './siem_graphql_client'; +import { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration'; + +export const services = { + chance: kibanaApiIntegrationServices.chance, + esSupertest: kibanaApiIntegrationServices.esSupertest, + supertest: kibanaApiIntegrationServices.supertest, + + esArchiver: kibanaCommonServices.esArchiver, + kibanaServer: kibanaCommonServices.kibanaServer, + retry: kibanaCommonServices.retry, + + es: EsProvider, + esSupertestWithoutAuth: EsSupertestWithoutAuthProvider, + infraOpsGraphQLClient: InfraOpsGraphQLClientProvider, + infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider, + infraOpsSourceConfiguration: InfraOpsSourceConfigurationProvider, + security: SecurityServiceProvider, + siemGraphQLClient: SiemGraphQLClientProvider, + siemGraphQLClientFactory: SiemGraphQLClientFactoryProvider, + spaces: SpacesServiceProvider, + supertestWithoutAuth: SupertestWithoutAuthProvider, + usageAPI: UsageAPIProvider, +}; diff --git a/x-pack/test/api_integration/services/infraops_graphql_client.js b/x-pack/test/api_integration/services/infraops_graphql_client.ts similarity index 64% rename from x-pack/test/api_integration/services/infraops_graphql_client.js rename to x-pack/test/api_integration/services/infraops_graphql_client.ts index 65c17300687c2a..33d1a59575c173 100644 --- a/x-pack/test/api_integration/services/infraops_graphql_client.js +++ b/x-pack/test/api_integration/services/infraops_graphql_client.ts @@ -10,22 +10,33 @@ import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemo import { ApolloClient } from 'apollo-client'; import { HttpLink } from 'apollo-link-http'; +import { FtrProviderContext } from '../ftr_provider_context'; + import introspectionQueryResultData from '../../../legacy/plugins/infra/public/graphql/introspection.json'; -export function InfraOpsGraphQLClientProvider({ getService }) { - return new InfraOpsGraphQLClientFactoryProvider({ getService })(); +export function InfraOpsGraphQLClientProvider(context: FtrProviderContext) { + return InfraOpsGraphQLClientFactoryProvider(context)(); +} + +interface InfraOpsGraphQLClientFactoryOptions { + username?: string; + password?: string; + basePath?: string; } -export function InfraOpsGraphQLClientFactoryProvider({ getService }) { +export function InfraOpsGraphQLClientFactoryProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const [superUsername, superPassword] = config.get('servers.elasticsearch.auth').split(':'); + const superAuth: string = config.get('servers.elasticsearch.auth'); + const [superUsername, superPassword] = superAuth.split(':'); + + return function(options?: InfraOpsGraphQLClientFactoryOptions) { + const { username = superUsername, password = superPassword, basePath = null } = options || {}; - return function ({ username = superUsername, password = superPassword, basePath = null } = {}) { const kbnURLWithoutAuth = formatUrl({ ...config.get('servers.kibana'), auth: false }); const httpLink = new HttpLink({ credentials: 'same-origin', - fetch, + fetch: fetch as any, headers: { 'kbn-xsrf': 'xxx', authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`, @@ -41,14 +52,14 @@ export function InfraOpsGraphQLClientFactoryProvider({ getService }) { }), defaultOptions: { query: { - fetchPolicy: 'no-cache' + fetchPolicy: 'no-cache', }, watchQuery: { - fetchPolicy: 'no-cache' + fetchPolicy: 'no-cache', }, mutate: { - fetchPolicy: 'no-cache' - }, + fetchPolicy: 'no-cache', + } as any, }, link: httpLink, }); diff --git a/x-pack/test/api_integration/services/infraops_source_configuration.js b/x-pack/test/api_integration/services/infraops_source_configuration.ts similarity index 71% rename from x-pack/test/api_integration/services/infraops_source_configuration.js rename to x-pack/test/api_integration/services/infraops_source_configuration.ts index cb558e3a93e155..facfe485ab88a3 100644 --- a/x-pack/test/api_integration/services/infraops_source_configuration.js +++ b/x-pack/test/api_integration/services/infraops_source_configuration.ts @@ -6,6 +6,12 @@ import gql from 'graphql-tag'; +import { FtrProviderContext } from '../ftr_provider_context'; +import { + UpdateSourceInput, + UpdateSourceResult, +} from '../../../legacy/plugins/infra/public/graphql/types'; + const createSourceMutation = gql` mutation createSource($sourceId: ID!, $sourceProperties: UpdateSourceInput!) { createSource(id: $sourceId, sourceProperties: $sourceProperties) { @@ -38,13 +44,18 @@ const createSourceMutation = gql` } `; -export function InfraOpsSourceConfigurationProvider({ getService }) { +export function InfraOpsSourceConfigurationProvider({ getService }: FtrProviderContext) { const client = getService('infraOpsGraphQLClient'); const log = getService('log'); return { - async createConfiguration(sourceId, sourceProperties) { - log.debug(`Creating Infra UI source configuration "${sourceId}" with properties ${JSON.stringify(sourceProperties)}`); + async createConfiguration(sourceId: string, sourceProperties: UpdateSourceInput) { + log.debug( + `Creating Infra UI source configuration "${sourceId}" with properties ${JSON.stringify( + sourceProperties + )}` + ); + const response = await client.mutate({ mutation: createSourceMutation, variables: { @@ -53,7 +64,8 @@ export function InfraOpsSourceConfigurationProvider({ getService }) { }, }); - return response.data.createSource.source.version; + const result: UpdateSourceResult = response.data!.createSource; + return result.source.version; }, }; } diff --git a/x-pack/test/api_integration/services/siem_graphql_client.js b/x-pack/test/api_integration/services/siem_graphql_client.ts similarity index 63% rename from x-pack/test/api_integration/services/siem_graphql_client.js rename to x-pack/test/api_integration/services/siem_graphql_client.ts index 4583283dae8b83..7d6aa5e8a9dd56 100644 --- a/x-pack/test/api_integration/services/siem_graphql_client.js +++ b/x-pack/test/api_integration/services/siem_graphql_client.ts @@ -10,22 +10,32 @@ import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemo import { ApolloClient } from 'apollo-client'; import { HttpLink } from 'apollo-link-http'; +import { FtrProviderContext } from '../ftr_provider_context'; import introspectionQueryResultData from '../../../legacy/plugins/siem/public/graphql/introspection.json'; -export function SiemGraphQLClientProvider({ getService }) { - return new SiemGraphQLClientFactoryProvider({ getService })(); +interface SiemGraphQLClientFactoryOptions { + username?: string; + password?: string; + basePath?: string; } -export function SiemGraphQLClientFactoryProvider({ getService }) { +export function SiemGraphQLClientProvider(context: FtrProviderContext) { + return SiemGraphQLClientFactoryProvider(context)(); +} + +export function SiemGraphQLClientFactoryProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const [superUsername, superPassword] = config.get('servers.elasticsearch.auth').split(':'); + const superAuth: string = config.get('servers.elasticsearch.auth'); + const [superUsername, superPassword] = superAuth.split(':'); + + return function(options?: SiemGraphQLClientFactoryOptions) { + const { username = superUsername, password = superPassword, basePath = null } = options || {}; - return function ({ username = superUsername, password = superPassword, basePath = null } = {}) { const kbnURLWithoutAuth = formatUrl({ ...config.get('servers.kibana'), auth: false }); const httpLink = new HttpLink({ credentials: 'same-origin', - fetch, + fetch: fetch as any, headers: { 'kbn-xsrf': 'xxx', authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`, diff --git a/x-pack/test/common/services/security/index.ts b/x-pack/test/common/services/security/index.ts index e5845098f23102..5e787aa5938672 100644 --- a/x-pack/test/common/services/security/index.ts +++ b/x-pack/test/common/services/security/index.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ import { format as formatUrl } from 'url'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; -import { LogService } from '../../../types/services'; +import { ToolingLog } from '@kbn/dev-utils'; +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; import { Role } from './role'; import { User } from './user'; @@ -13,13 +13,13 @@ export class SecurityService { public role: Role; public user: User; - constructor(url: string, log: LogService) { + constructor(url: string, log: ToolingLog) { this.role = new Role(url, log); this.user = new User(url, log); } } -export function SecurityServiceProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function SecurityServiceProvider({ getService }: GenericFtrProviderContext<{}, {}>) { const log = getService('log'); const config = getService('config'); const url = formatUrl(config.get('servers.kibana')); diff --git a/x-pack/test/common/services/security/role.ts b/x-pack/test/common/services/security/role.ts index e96f85c702337e..341b7d0b877f19 100644 --- a/x-pack/test/common/services/security/role.ts +++ b/x-pack/test/common/services/security/role.ts @@ -5,13 +5,13 @@ */ import axios, { AxiosInstance } from 'axios'; import util from 'util'; -import { LogService } from '../../../types/services'; +import { ToolingLog } from '@kbn/dev-utils'; export class Role { - private log: LogService; + private log: ToolingLog; private axios: AxiosInstance; - constructor(url: string, log: LogService) { + constructor(url: string, log: ToolingLog) { this.log = log; this.axios = axios.create({ headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/role' }, diff --git a/x-pack/test/common/services/security/user.ts b/x-pack/test/common/services/security/user.ts index 2685222150df98..d591e6a651582c 100644 --- a/x-pack/test/common/services/security/user.ts +++ b/x-pack/test/common/services/security/user.ts @@ -5,13 +5,13 @@ */ import axios, { AxiosInstance } from 'axios'; import util from 'util'; -import { LogService } from '../../../types/services'; +import { ToolingLog } from '@kbn/dev-utils'; export class User { - private log: LogService; + private log: ToolingLog; private axios: AxiosInstance; - constructor(url: string, log: LogService) { + constructor(url: string, log: ToolingLog) { this.log = log; this.axios = axios.create({ headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/user' }, diff --git a/x-pack/test/common/services/spaces/index.ts b/x-pack/test/common/services/spaces/index.ts index 08d7a676e79190..b6b1b09b02b6c1 100644 --- a/x-pack/test/common/services/spaces/index.ts +++ b/x-pack/test/common/services/spaces/index.ts @@ -6,14 +6,14 @@ import axios, { AxiosInstance } from 'axios'; import { format as formatUrl } from 'url'; import util from 'util'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; -import { LogService } from '../../../types/services'; +import { ToolingLog } from '@kbn/dev-utils'; +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; export class SpacesService { - private log: LogService; + private log: ToolingLog; private axios: AxiosInstance; - constructor(url: string, log: LogService) { + constructor(url: string, log: ToolingLog) { this.log = log; this.axios = axios.create({ headers: { 'kbn-xsrf': 'x-pack/ftr/services/spaces/space' }, @@ -48,7 +48,7 @@ export class SpacesService { } } -export function SpacesServiceProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function SpacesServiceProvider({ getService }: GenericFtrProviderContext<{}, {}>) { const log = getService('log'); const config = getService('config'); const url = formatUrl(config.get('servers.kibana')); diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts index 75a32f08a4469c..0834ff11ced58f 100644 --- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts +++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const kibanaServer = getService('kibanaServer'); const security = getService('security'); @@ -192,7 +191,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { + timeout: 10000, + }); }); }); }); diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts index 6b32bfd1874794..649f3bad0ff155 100644 --- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts +++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'settings', 'security', 'spaceSelector']); @@ -83,7 +82,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { + timeout: 10000, + }); }); }); }); diff --git a/x-pack/test/functional/apps/advanced_settings/index.ts b/x-pack/test/functional/apps/advanced_settings/index.ts index 643a94b2fa456b..d9fcc8a13c4712 100644 --- a/x-pack/test/functional/apps/advanced_settings/index.ts +++ b/x-pack/test/functional/apps/advanced_settings/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function advancedSettingsApp({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function advancedSettingsApp({ loadTestFile }: FtrProviderContext) { describe('Advanced Settings', function canvasAppTestSuite() { this.tags(['ciGroup2', 'skipFirefox']); // CI requires tags ヽ(゜Q。)ノ？ loadTestFile(require.resolve('./feature_controls/advanced_settings_security')); diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts index 1f0d09238fc6d1..3478a829084d6f 100644 --- a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts +++ b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const PageObjects = getPageObjects(['common', 'error', 'security']); @@ -70,7 +69,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('can navigate to APM app', async () => { await PageObjects.common.navigateToApp('apm'); - await testSubjects.existOrFail('apmMainContainer', 10000); + await testSubjects.existOrFail('apmMainContainer', { + timeout: 10000, + }); }); it(`doesn't show read-only badge`, async () => { @@ -119,7 +120,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('can navigate to APM app', async () => { await PageObjects.common.navigateToApp('apm'); - await testSubjects.existOrFail('apmMainContainer', 10000); + await testSubjects.existOrFail('apmMainContainer', { + timeout: 10000, + }); }); it(`shows read-only badge`, async () => { diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts index ff32bcc5c6c869..6f6ea06f4ab02d 100644 --- a/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts +++ b/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'error', 'timePicker', 'security']); const testSubjects = getService('testSubjects'); @@ -40,7 +39,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('can navigate to Uptime app', async () => { await PageObjects.common.navigateToApp('apm'); - await testSubjects.existOrFail('apmMainContainer', 10000); + await testSubjects.existOrFail('apmMainContainer', { + timeout: 10000, + }); }); }); diff --git a/x-pack/test/functional/apps/apm/feature_controls/index.ts b/x-pack/test/functional/apps/apm/feature_controls/index.ts index 1ca30e0faebdf0..2c8db0c70c990d 100644 --- a/x-pack/test/functional/apps/apm/feature_controls/index.ts +++ b/x-pack/test/functional/apps/apm/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./apm_security')); diff --git a/x-pack/test/functional/apps/apm/index.ts b/x-pack/test/functional/apps/apm/index.ts index d8f4177741113d..945af09183f03d 100644 --- a/x-pack/test/functional/apps/apm/index.ts +++ b/x-pack/test/functional/apps/apm/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('APM', function() { this.tags('ciGroup6'); loadTestFile(require.resolve('./feature_controls')); diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts index 3ae5fa5e440226..a55ada12b4749b 100644 --- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts +++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'canvas', 'security', 'spaceSelector']); diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts index 6901dfa7352c15..5e03c0683e224f 100644 --- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts +++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'canvas', 'security', 'spaceSelector']); diff --git a/x-pack/test/functional/apps/code/code_intelligence.ts b/x-pack/test/functional/apps/code/code_intelligence.ts index aede5ca8c7c4ff..c2cfa3f4207147 100644 --- a/x-pack/test/functional/apps/code/code_intelligence.ts +++ b/x-pack/test/functional/apps/code/code_intelligence.ts @@ -5,13 +5,12 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function codeIntelligenceFunctionalTests({ getService, getPageObjects, -}: TestInvoker) { +}: FtrProviderContext) { // const esArchiver = getService('esArchiver'); const testSubjects = getService('testSubjects'); const retry = getService('retry'); diff --git a/x-pack/test/functional/apps/code/explore_repository.ts b/x-pack/test/functional/apps/code/explore_repository.ts index 36a07a9ca15f79..3799d429d29cb3 100644 --- a/x-pack/test/functional/apps/code/explore_repository.ts +++ b/x-pack/test/functional/apps/code/explore_repository.ts @@ -5,13 +5,12 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function exploreRepositoryFunctionalTests({ getService, getPageObjects, -}: TestInvoker) { +}: FtrProviderContext) { // const esArchiver = getService('esArchiver'); const browser = getService('browser'); const testSubjects = getService('testSubjects'); diff --git a/x-pack/test/functional/apps/code/file_tree.ts b/x-pack/test/functional/apps/code/file_tree.ts index b157efc5e555d9..4dbeecedaca98c 100644 --- a/x-pack/test/functional/apps/code/file_tree.ts +++ b/x-pack/test/functional/apps/code/file_tree.ts @@ -5,13 +5,12 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function exploreRepositoryFunctionalTests({ getService, getPageObjects, -}: TestInvoker) { +}: FtrProviderContext) { // const esArchiver = getService('esArchiver'); const browser = getService('browser'); const testSubjects = getService('testSubjects'); diff --git a/x-pack/test/functional/apps/code/history.ts b/x-pack/test/functional/apps/code/history.ts index 5a3dc4c040a130..697267009e8b1c 100644 --- a/x-pack/test/functional/apps/code/history.ts +++ b/x-pack/test/functional/apps/code/history.ts @@ -5,13 +5,12 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function manageRepositoriesFunctionalTests({ getService, getPageObjects, -}: TestInvoker) { +}: FtrProviderContext) { // const esArchiver = getService('esArchiver'); const testSubjects = getService('testSubjects'); const retry = getService('retry'); diff --git a/x-pack/test/functional/apps/code/index.ts b/x-pack/test/functional/apps/code/index.ts index ccd621723bf7ac..f96e5af7fdc594 100644 --- a/x-pack/test/functional/apps/code/index.ts +++ b/x-pack/test/functional/apps/code/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function codeApp({ loadTestFile }: TestInvoker) { +export default function codeApp({ loadTestFile }: FtrProviderContext) { describe('Code', function codeAppTestSuite() { this.tags('ciGroup2'); loadTestFile(require.resolve('./manage_repositories')); diff --git a/x-pack/test/functional/apps/code/lib/types.ts b/x-pack/test/functional/apps/code/lib/types.ts deleted file mode 100644 index 2ed91406e5f48d..00000000000000 --- a/x-pack/test/functional/apps/code/lib/types.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export type DescribeFn = (text: string, fn: () => void) => void; - -export interface TestDefinitionAuthentication { - username?: string; - password?: string; -} - -export type LoadTestFileFn = (path: string) => string; - -export type GetServiceFn = (service: string) => any; - -export type ReadConfigFileFn = (path: string) => any; - -export type GetPageObjectsFn = (pageObjects: string[]) => any; - -export interface TestInvoker { - getService: GetServiceFn; - getPageObjects: GetPageObjectsFn; - loadTestFile: LoadTestFileFn; - readConfigFile: ReadConfigFileFn; -} diff --git a/x-pack/test/functional/apps/code/manage_repositories.ts b/x-pack/test/functional/apps/code/manage_repositories.ts index 4fc28d6a3130e7..56a26c51813ae2 100644 --- a/x-pack/test/functional/apps/code/manage_repositories.ts +++ b/x-pack/test/functional/apps/code/manage_repositories.ts @@ -5,13 +5,12 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function manageRepositoriesFunctionalTests({ getService, getPageObjects, -}: TestInvoker) { +}: FtrProviderContext) { // const esArchiver = getService('esArchiver'); const testSubjects = getService('testSubjects'); const retry = getService('retry'); diff --git a/x-pack/test/functional/apps/code/search.ts b/x-pack/test/functional/apps/code/search.ts index c10f6b4e142ac2..1b910b4ffc5eeb 100644 --- a/x-pack/test/functional/apps/code/search.ts +++ b/x-pack/test/functional/apps/code/search.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function searchFunctonalTests({ getService, getPageObjects }: TestInvoker) { +export default function searchFunctonalTests({ getService, getPageObjects }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const testSubjects = getService('testSubjects'); const retry = getService('retry'); diff --git a/x-pack/test/functional/apps/code/with_security.ts b/x-pack/test/functional/apps/code/with_security.ts index 1578ef69fae55a..7fcaa4b0964dcf 100644 --- a/x-pack/test/functional/apps/code/with_security.ts +++ b/x-pack/test/functional/apps/code/with_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function testWithSecurity({ getService, getPageObjects }: TestInvoker) { +export default function testWithSecurity({ getService, getPageObjects }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const testSubjects = getService('testSubjects'); const retry = getService('retry'); diff --git a/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts b/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts index 54b504e0f35242..eef47ae0341c84 100644 --- a/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts +++ b/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const pageObjects = getPageObjects(['common', 'crossClusterReplication']); const log = getService('log'); diff --git a/x-pack/test/functional/apps/cross_cluster_replication/index.ts b/x-pack/test/functional/apps/cross_cluster_replication/index.ts index 19e8012dd9b570..21fc1982edc422 100644 --- a/x-pack/test/functional/apps/cross_cluster_replication/index.ts +++ b/x-pack/test/functional/apps/cross_cluster_replication/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('Cross Cluster Replication app', function() { this.tags('ciGroup4'); loadTestFile(require.resolve('./home_page')); diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts index 84458d4c172234..5a43b15db56e24 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts @@ -10,10 +10,9 @@ import { DashboardConstants, } from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'spaceSelector', 'share']); @@ -91,7 +90,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('dashboardLandingPage', 10000); + await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 }); await testSubjects.existOrFail('newItemButton'); }); @@ -108,7 +107,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('emptyDashboardAddPanelButton', 10000); + await testSubjects.existOrFail('emptyDashboardAddPanelButton', { timeout: 10000 }); }); it(`can view existing Dashboard`, async () => { @@ -116,7 +115,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('embeddablePanelHeading-APie', 10000); + await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 }); }); it(`does not allow a visualization to be edited`, async () => { @@ -242,7 +241,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('dashboardLandingPage', 10000); + await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 }); await testSubjects.missingOrFail('newItemButton'); }); @@ -259,7 +258,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 20000); + await testSubjects.existOrFail('homeApp', { timeout: 20000 }); }); it(`can view existing Dashboard`, async () => { @@ -267,7 +266,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('embeddablePanelHeading-APie', 10000); + await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 }); }); it(`Permalinks doesn't show create short-url button`, async () => { @@ -326,7 +325,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`create new dashboard redirects to the home page`, async () => { @@ -338,7 +337,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 20000); + await testSubjects.existOrFail('homeApp', { timeout: 20000 }); }); it(`edit dashboard for object which doesn't exist redirects to the home page`, async () => { @@ -350,7 +349,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`edit dashboard for object which exists redirects to the home page`, async () => { @@ -358,7 +357,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts index aa852d1ae81119..17cc9dd5cf942a 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts @@ -10,10 +10,9 @@ import { DashboardConstants, } from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'spaceSelector']); @@ -62,7 +61,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('dashboardLandingPage', 10000); + await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 }); await testSubjects.existOrFail('newItemButton'); }); @@ -76,7 +75,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('emptyDashboardAddPanelButton', 10000); + await testSubjects.existOrFail('emptyDashboardAddPanelButton', { timeout: 10000 }); }); it(`can view existing Dashboard`, async () => { @@ -85,7 +84,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('embeddablePanelHeading-APie', 10000); + await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 }); }); }); @@ -126,7 +125,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`edit dashboard for object which doesn't exist redirects to the home page`, async () => { @@ -139,7 +138,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`edit dashboard for object which exists redirects to the home page`, async () => { @@ -148,7 +147,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/index.ts b/x-pack/test/functional/apps/dashboard/feature_controls/index.ts index b860dd78dc367d..b452a57081d7ca 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/index.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags(['skipFirefox']); loadTestFile(require.resolve('./dashboard_security')); diff --git a/x-pack/test/functional/apps/dashboard/index.ts b/x-pack/test/functional/apps/dashboard/index.ts index 5cea2fda9644d6..b596d7bcbb4621 100644 --- a/x-pack/test/functional/apps/dashboard/index.ts +++ b/x-pack/test/functional/apps/dashboard/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('dashboard', function() { this.tags('ciGroup3'); diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts index a92cb0a7c3d794..1a63a6ad3c9e44 100644 --- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts +++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const PageObjects = getPageObjects(['common', 'console', 'security']); @@ -239,21 +238,21 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa await PageObjects.common.navigateToUrl('console', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`navigating to search profiler redirect to homepage`, async () => { await PageObjects.common.navigateToUrl('searchProfiler', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`navigating to grok debugger redirect to homepage`, async () => { await PageObjects.common.navigateToUrl('grokDebugger', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts index c4a16c18d3beb0..666b9175da275f 100644 --- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts +++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'spaceSelector']); @@ -91,21 +90,21 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa await PageObjects.common.navigateToUrl('console', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`navigating to search profiler redirect to homepage`, async () => { await PageObjects.common.navigateToUrl('searchProfiler', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`navigating to grok debugger redirect to homepage`, async () => { await PageObjects.common.navigateToUrl('grokDebugger', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts index d0d92b74022c01..72f87c2898d58c 100644 --- a/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts +++ b/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./dev_tools_security')); diff --git a/x-pack/test/functional/apps/dev_tools/index.ts b/x-pack/test/functional/apps/dev_tools/index.ts index 1d959575322af9..73ff5d5749cb86 100644 --- a/x-pack/test/functional/apps/dev_tools/index.ts +++ b/x-pack/test/functional/apps/dev_tools/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('console', function() { this.tags('ciGroup3'); diff --git a/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts b/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts index 794b7996628104..f8eea76026cc2d 100644 --- a/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts +++ b/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const PageObjects = getPageObjects(['common']); const testSubjects = getService('testSubjects'); const aceEditor = getService('aceEditor'); 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 2e5f9a9f041b4a..8712247ee7a244 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 @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const globalNav = getService('globalNav'); @@ -91,7 +90,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('shows save button', async () => { await PageObjects.common.navigateToApp('discover'); - await testSubjects.existOrFail('discoverSaveButton', 20000); + await testSubjects.existOrFail('discoverSaveButton', { timeout: 20000 }); }); it(`doesn't show read-only badge`, async () => { @@ -149,7 +148,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it(`doesn't show save button`, async () => { await PageObjects.common.navigateToApp('discover'); - await testSubjects.existOrFail('discoverNewButton', 10000); + await testSubjects.existOrFail('discoverNewButton', { timeout: 10000 }); await testSubjects.missingOrFail('discoverSaveButton'); }); @@ -255,7 +254,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa await PageObjects.common.navigateToUrl('discover', '', { ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); 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 341e87c453c298..243d5a0b6b6d0d 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 @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects([ @@ -63,7 +62,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa await PageObjects.common.navigateToApp('discover', { basePath: '/s/custom_space', }); - await testSubjects.existOrFail('discoverSaveButton', 10000); + await testSubjects.existOrFail('discoverSaveButton', { timeout: 10000 }); }); it('shows "visualize" field button', async () => { @@ -162,7 +161,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa basePath: '/s/custom_space', ensureCurrentUrl: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/discover/feature_controls/index.ts b/x-pack/test/functional/apps/discover/feature_controls/index.ts index 8ae212216fa916..5f9b9da86c8a6e 100644 --- a/x-pack/test/functional/apps/discover/feature_controls/index.ts +++ b/x-pack/test/functional/apps/discover/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./discover_security')); diff --git a/x-pack/test/functional/apps/discover/index.ts b/x-pack/test/functional/apps/discover/index.ts index 575d485e6115a8..e9ba3aa88d75e8 100644 --- a/x-pack/test/functional/apps/discover/index.ts +++ b/x-pack/test/functional/apps/discover/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('discover', function() { this.tags('ciGroup3'); diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts index 15aa75fcf97d8b..05f6717106bad8 100644 --- a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts +++ b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const PageObjects = getPageObjects(['common', 'graph', 'security', 'error']); diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts index 976286fefc3910..a0b81a8df702a2 100644 --- a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts +++ b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'graph', 'security', 'error']); diff --git a/x-pack/test/functional/apps/graph/feature_controls/index.ts b/x-pack/test/functional/apps/graph/feature_controls/index.ts index 582123b93e9a86..56754c0dc9f60b 100644 --- a/x-pack/test/functional/apps/graph/feature_controls/index.ts +++ b/x-pack/test/functional/apps/graph/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./graph_security')); diff --git a/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts b/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts index 9b359171b0aa00..c7ad3f933ea64a 100644 --- a/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts +++ b/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const pageObjects = getPageObjects(['common', 'indexLifecycleManagement']); const log = getService('log'); diff --git a/x-pack/test/functional/apps/index_lifecycle_management/index.ts b/x-pack/test/functional/apps/index_lifecycle_management/index.ts index 523c72905deb1d..9078a9d681e7e9 100644 --- a/x-pack/test/functional/apps/index_lifecycle_management/index.ts +++ b/x-pack/test/functional/apps/index_lifecycle_management/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('Index Lifecycle Management app', function() { this.tags('ciGroup7'); loadTestFile(require.resolve('./home_page')); diff --git a/x-pack/test/functional/apps/index_management/home_page.ts b/x-pack/test/functional/apps/index_management/home_page.ts index f04cc07ba79df9..687b508df61058 100644 --- a/x-pack/test/functional/apps/index_management/home_page.ts +++ b/x-pack/test/functional/apps/index_management/home_page.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const pageObjects = getPageObjects(['common', 'indexManagement']); const log = getService('log'); diff --git a/x-pack/test/functional/apps/index_management/index.ts b/x-pack/test/functional/apps/index_management/index.ts index f4af1b40c803d4..b816142a17039d 100644 --- a/x-pack/test/functional/apps/index_management/index.ts +++ b/x-pack/test/functional/apps/index_management/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('Index Management app', function() { this.tags('ciGroup3'); loadTestFile(require.resolve('./home_page')); diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts index aa402c6b993e7d..3978292bff98d4 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./index_patterns_security')); diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts index 63a90fb45a0830..cce5ededf2cf36 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const kibanaServer = getService('kibanaServer'); const security = getService('security'); @@ -197,7 +196,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts index 9a3bd5694f76fa..df086cf813c303 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'settings', 'security']); @@ -78,7 +77,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/index_patterns/index.ts b/x-pack/test/functional/apps/index_patterns/index.ts index ac5479e9c1c17d..4b4c1c6cf1cce3 100644 --- a/x-pack/test/functional/apps/index_patterns/index.ts +++ b/x-pack/test/functional/apps/index_patterns/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function advancedSettingsApp({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function advancedSettingsApp({ loadTestFile }: FtrProviderContext) { describe('Index Patterns', function indexPatternsTestSuite() { this.tags('ciGroup2'); loadTestFile(require.resolve('./feature_controls')); diff --git a/x-pack/test/functional/apps/infra/feature_controls/index.ts b/x-pack/test/functional/apps/infra/feature_controls/index.ts index 112c1ca1372781..12e5984660c0d6 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/index.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { // FLAKY: https://github.com/elastic/kibana/issues/35932 describe.skip('feature controls', function() { this.tags('skipFirefox'); diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts index dcd6b2a82e6a88..64feb703a11d74 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts @@ -4,12 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; import { DATES } from '../constants'; const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'infraHome', 'security']); diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts index 14a89fa6b2470f..8a584b9ef58395 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts @@ -5,13 +5,12 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; import { DATES } from '../constants'; const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'infraHome', 'security', 'spaceSelector']); diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts index c102cb0381e218..76222a24b38bae 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'infraHome', 'security']); diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts index 5cd94516e1adcc..f336716167108d 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'infraHome', 'security', 'spaceSelector']); diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts index e93d3490fd993c..0c1d57202b8eb3 100644 --- a/x-pack/test/functional/apps/infra/home_page.ts +++ b/x-pack/test/functional/apps/infra/home_page.ts @@ -4,14 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { DATES } from './constants'; const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData; const DATE_WITHOUT_DATA = DATES.metricsAndLogs.hosts.withoutData; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const pageObjects = getPageObjects(['common', 'infraHome']); diff --git a/x-pack/test/functional/apps/infra/index.ts b/x-pack/test/functional/apps/infra/index.ts index d2f293fa834346..ac747dca23b4a7 100644 --- a/x-pack/test/functional/apps/infra/index.ts +++ b/x-pack/test/functional/apps/infra/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('InfraOps app', function() { this.tags('ciGroup7'); diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts index 235dd729072a4b..27a950ef827ee9 100644 --- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts +++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const infraLogStream = getService('infraLogStream'); const infraSourceConfigurationFlyout = getService('infraSourceConfigurationFlyout'); diff --git a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts index b6286d8ba8936b..9b22c7ceffb332 100644 --- a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts +++ b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts @@ -4,13 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { DATES } from './constants'; const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const infraSourceConfigurationFlyout = getService('infraSourceConfigurationFlyout'); const pageObjects = getPageObjects(['common', 'infraHome']); diff --git a/x-pack/test/functional/apps/license_management/home_page.ts b/x-pack/test/functional/apps/license_management/home_page.ts index 502e19138b7b3d..222e5a4fd670c3 100644 --- a/x-pack/test/functional/apps/license_management/home_page.ts +++ b/x-pack/test/functional/apps/license_management/home_page.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const pageObjects = getPageObjects(['common', 'licenseManagement']); const log = getService('log'); diff --git a/x-pack/test/functional/apps/license_management/index.ts b/x-pack/test/functional/apps/license_management/index.ts index dc541c7225571f..7524d00a4b8dd9 100644 --- a/x-pack/test/functional/apps/license_management/index.ts +++ b/x-pack/test/functional/apps/license_management/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('License app', function() { this.tags('ciGroup7'); loadTestFile(require.resolve('./home_page')); diff --git a/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts b/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts index 004a5c07ab9f49..ec7eb53fe83c27 100644 --- a/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts +++ b/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./ml_security')); diff --git a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts index a6a7a48e8f3686..a2b3270c98eb1e 100644 --- a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts +++ b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const appsMenu = getService('appsMenu'); diff --git a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts index 36ae88c759e12e..ea3c10f16ca604 100644 --- a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts +++ b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'error']); diff --git a/x-pack/test/functional/apps/machine_learning/index.ts b/x-pack/test/functional/apps/machine_learning/index.ts index a72b1dd3b6b73f..3f0e6d0d58142b 100644 --- a/x-pack/test/functional/apps/machine_learning/index.ts +++ b/x-pack/test/functional/apps/machine_learning/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('machine learning', function() { this.tags('ciGroup3'); diff --git a/x-pack/test/functional/apps/machine_learning/pages.ts b/x-pack/test/functional/apps/machine_learning/pages.ts index 05f618616aafa0..4d6f6d6f941643 100644 --- a/x-pack/test/functional/apps/machine_learning/pages.ts +++ b/x-pack/test/functional/apps/machine_learning/pages.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts index 22f3c0fe643928..cfec4749f6847d 100644 --- a/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts +++ b/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'settings', 'security', 'maps']); diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts index b36865ef86d7ee..5e0022745680c6 100644 --- a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts +++ b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'maps', 'security']); diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/index.ts b/x-pack/test/functional/apps/monitoring/feature_controls/index.ts index a97d30b61eb9a8..77e4cfd45db7a7 100644 --- a/x-pack/test/functional/apps/monitoring/feature_controls/index.ts +++ b/x-pack/test/functional/apps/monitoring/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./monitoring_security')); diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts index 3e6e9cc67efaee..2d645d161c134a 100644 --- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts +++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const appsMenu = getService('appsMenu'); diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts index 58282269a5422a..94714f7b0ca348 100644 --- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts +++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'error']); diff --git a/x-pack/test/functional/apps/remote_clusters/home_page.ts b/x-pack/test/functional/apps/remote_clusters/home_page.ts index 476591e760875e..879a0a11ede78a 100644 --- a/x-pack/test/functional/apps/remote_clusters/home_page.ts +++ b/x-pack/test/functional/apps/remote_clusters/home_page.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const pageObjects = getPageObjects(['common', 'remoteClusters']); describe('Home page', function() { diff --git a/x-pack/test/functional/apps/remote_clusters/index.ts b/x-pack/test/functional/apps/remote_clusters/index.ts index 9538f6a04cbfe2..dc47bd9de38156 100644 --- a/x-pack/test/functional/apps/remote_clusters/index.ts +++ b/x-pack/test/functional/apps/remote_clusters/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('Remote Clusters app', function() { this.tags('ciGroup4'); loadTestFile(require.resolve('./home_page')); diff --git a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts index 85976c8227c753..692dc589cc1572 100644 --- a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts +++ b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const testSubjects = getService('testSubjects'); diff --git a/x-pack/test/functional/apps/saved_objects_management/index.ts b/x-pack/test/functional/apps/saved_objects_management/index.ts index b7780669990d7c..ce550d3a5fa243 100644 --- a/x-pack/test/functional/apps/saved_objects_management/index.ts +++ b/x-pack/test/functional/apps/saved_objects_management/index.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function savedObjectsManagementApp({ - loadTestFile, -}: KibanaFunctionalTestDefaultProviders) { +export default function savedObjectsManagementApp({ loadTestFile }: FtrProviderContext) { describe('Saved objects management', function savedObjectsManagementAppTestSuite() { this.tags(['ciGroup2', 'skipFirefox']); loadTestFile(require.resolve('./feature_controls/saved_objects_management_security')); diff --git a/x-pack/test/functional/apps/snapshot_restore/home_page.ts b/x-pack/test/functional/apps/snapshot_restore/home_page.ts index 5847987e0405b0..99d3ea7834e6ba 100644 --- a/x-pack/test/functional/apps/snapshot_restore/home_page.ts +++ b/x-pack/test/functional/apps/snapshot_restore/home_page.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const pageObjects = getPageObjects(['common', 'snapshotRestore']); const log = getService('log'); diff --git a/x-pack/test/functional/apps/snapshot_restore/index.ts b/x-pack/test/functional/apps/snapshot_restore/index.ts index acde2b9a247d8f..f589555fe876d8 100644 --- a/x-pack/test/functional/apps/snapshot_restore/index.ts +++ b/x-pack/test/functional/apps/snapshot_restore/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('Snapshots app', function() { this.tags('ciGroup1'); loadTestFile(require.resolve('./home_page')); diff --git a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts index 7ac616ce08962b..1e74322d0676d6 100644 --- a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts +++ b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'settings', 'security']); diff --git a/x-pack/test/functional/apps/spaces/index.ts b/x-pack/test/functional/apps/spaces/index.ts index ccb7d28ae51b6b..56e2d410678ffa 100644 --- a/x-pack/test/functional/apps/spaces/index.ts +++ b/x-pack/test/functional/apps/spaces/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function spacesApp({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function spacesApp({ loadTestFile }: FtrProviderContext) { describe('Spaces app', function spacesAppTestSuite() { this.tags('ciGroup4'); diff --git a/x-pack/test/functional/apps/spaces/spaces_selection.ts b/x-pack/test/functional/apps/spaces/spaces_selection.ts index e7a265589f25cd..9b4c99334dd672 100644 --- a/x-pack/test/functional/apps/spaces/spaces_selection.ts +++ b/x-pack/test/functional/apps/spaces/spaces_selection.ts @@ -3,13 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function spaceSelectorFunctonalTests({ getService, getPageObjects, -}: KibanaFunctionalTestDefaultProviders) { +}: FtrProviderContext) { const esArchiver = getService('esArchiver'); const PageObjects = getPageObjects([ 'common', diff --git a/x-pack/test/functional/apps/status_page/index.ts b/x-pack/test/functional/apps/status_page/index.ts index 21880070e4c051..f078f0b8f3a445 100644 --- a/x-pack/test/functional/apps/status_page/index.ts +++ b/x-pack/test/functional/apps/status_page/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function statusPage({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function statusPage({ loadTestFile }: FtrProviderContext) { describe('Status page', function statusPageTestSuite() { this.tags('ciGroup4'); diff --git a/x-pack/test/functional/apps/status_page/lib/types.ts b/x-pack/test/functional/apps/status_page/lib/types.ts deleted file mode 100644 index 2ed91406e5f48d..00000000000000 --- a/x-pack/test/functional/apps/status_page/lib/types.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export type DescribeFn = (text: string, fn: () => void) => void; - -export interface TestDefinitionAuthentication { - username?: string; - password?: string; -} - -export type LoadTestFileFn = (path: string) => string; - -export type GetServiceFn = (service: string) => any; - -export type ReadConfigFileFn = (path: string) => any; - -export type GetPageObjectsFn = (pageObjects: string[]) => any; - -export interface TestInvoker { - getService: GetServiceFn; - getPageObjects: GetPageObjectsFn; - loadTestFile: LoadTestFileFn; - readConfigFile: ReadConfigFileFn; -} diff --git a/x-pack/test/functional/apps/status_page/status_page.ts b/x-pack/test/functional/apps/status_page/status_page.ts index 6df02589a9ce1a..ffd87ff74588cf 100644 --- a/x-pack/test/functional/apps/status_page/status_page.ts +++ b/x-pack/test/functional/apps/status_page/status_page.ts @@ -3,10 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { TestInvoker } from './lib/types'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function statusPageFunctonalTests({ getService, getPageObjects }: TestInvoker) { +export default function statusPageFunctonalTests({ + getService, + getPageObjects, +}: FtrProviderContext) { const esArchiver = getService('esArchiver'); const PageObjects = getPageObjects(['security', 'statusPage', 'home']); diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts index 77d50037ce98b1..073d54b9088bbf 100644 --- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts +++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'timelion', 'header', 'security', 'spaceSelector']); diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts index 3871a7d5142d72..9c39e7efa35aca 100644 --- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts +++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'timelion', 'security', 'spaceSelector']); diff --git a/x-pack/test/functional/apps/timelion/index.ts b/x-pack/test/functional/apps/timelion/index.ts index 766d13c6629c92..ff90a906ecd300 100644 --- a/x-pack/test/functional/apps/timelion/index.ts +++ b/x-pack/test/functional/apps/timelion/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function timelion({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function timelion({ loadTestFile }: FtrProviderContext) { describe('Timelion', function visualizeTestSuite() { this.tags(['ciGroup4', 'skipFirefox']); diff --git a/x-pack/test/functional/apps/upgrade_assistant/index.ts b/x-pack/test/functional/apps/upgrade_assistant/index.ts index 5a731355196f1e..0e6c52f0812ee3 100644 --- a/x-pack/test/functional/apps/upgrade_assistant/index.ts +++ b/x-pack/test/functional/apps/upgrade_assistant/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function upgradeCheckup({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function upgradeCheckup({ loadTestFile }: FtrProviderContext) { describe('Upgrade checkup ', function upgradeAssistantTestSuite() { this.tags('ciGroup4'); diff --git a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts index a3b340d99cdfde..42118f4c63b1fe 100644 --- a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts +++ b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts @@ -4,13 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export export default function upgradeAssistantFunctionalTests({ getService, getPageObjects, -}: KibanaFunctionalTestDefaultProviders) { +}: FtrProviderContext) { const esArchiver = getService('esArchiver'); const PageObjects = getPageObjects(['upgradeAssistant']); diff --git a/x-pack/test/functional/apps/uptime/feature_controls/index.ts b/x-pack/test/functional/apps/uptime/feature_controls/index.ts index fbc3442c6b8568..839cc6487df483 100644 --- a/x-pack/test/functional/apps/uptime/feature_controls/index.ts +++ b/x-pack/test/functional/apps/uptime/feature_controls/index.ts @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('feature controls', function() { this.tags('skipFirefox'); loadTestFile(require.resolve('./uptime_security')); diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts index f9b0e9a81566c6..aa41cdc0af3d7d 100644 --- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts +++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SecurityService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security: SecurityService = getService('security'); const PageObjects = getPageObjects(['common', 'error', 'timePicker', 'security']); @@ -74,7 +73,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('can navigate to Uptime app', async () => { await PageObjects.common.navigateToApp('uptime'); - await testSubjects.existOrFail('uptimeApp', 10000); + await testSubjects.existOrFail('uptimeApp', { timeout: 10000 }); }); it(`doesn't show read-only badge`, async () => { @@ -127,7 +126,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('can navigate to Uptime app', async () => { await PageObjects.common.navigateToApp('uptime'); - await testSubjects.existOrFail('uptimeApp', 10000); + await testSubjects.existOrFail('uptimeApp', { timeout: 10000 }); }); it(`shows read-only badge`, async () => { diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts index cf23bff4be775a..86e16f0eebd486 100644 --- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts +++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts @@ -5,10 +5,9 @@ */ import expect from '@kbn/expect'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'error', 'timePicker', 'security']); const testSubjects = getService('testSubjects'); @@ -40,7 +39,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it('can navigate to Uptime app', async () => { await PageObjects.common.navigateToApp('uptime'); - await testSubjects.existOrFail('uptimeApp', 10000); + await testSubjects.existOrFail('uptimeApp', { timeout: 10000 }); }); }); diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts index 7a53ce7d32aa15..c1bc8f856c467d 100644 --- a/x-pack/test/functional/apps/uptime/index.ts +++ b/x-pack/test/functional/apps/uptime/index.ts @@ -4,12 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; const ARCHIVE = 'uptime/full_heartbeat'; -// eslint-disable-next-line import/no-default-export -export default ({ loadTestFile, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ loadTestFile, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const kibanaServer = getService('kibanaServer'); diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts index def84b57f06f72..27709af1a79820 100644 --- a/x-pack/test/functional/apps/uptime/monitor.ts +++ b/x-pack/test/functional/apps/uptime/monitor.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const pageObjects = getPageObjects(['uptime']); const archive = 'uptime/full_heartbeat'; diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts index eb7db170d73be8..120fb6100654a1 100644 --- a/x-pack/test/functional/apps/uptime/overview.ts +++ b/x-pack/test/functional/apps/uptime/overview.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default ({ getPageObjects }: KibanaFunctionalTestDefaultProviders) => { +export default ({ getPageObjects }: FtrProviderContext) => { // TODO: add UI functional tests const pageObjects = getPageObjects(['uptime']); diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts index 8447c2fffe6a71..a0f364964e7b7e 100644 --- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts +++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const security = getService('security'); const PageObjects = getPageObjects([ @@ -81,7 +80,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it(`landing page shows "Create new Visualization" button`, async () => { await PageObjects.visualize.gotoVisualizationLandingPage(); - await testSubjects.existOrFail('visualizeLandingPage', 10000); + await testSubjects.existOrFail('visualizeLandingPage', { timeout: 10000 }); await testSubjects.existOrFail('newItemButton'); }); @@ -94,7 +93,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('visualizationLoader', 10000); + await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 }); }); it('can save existing Visualization', async () => { @@ -102,7 +101,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('visualizeSaveButton', 10000); + await testSubjects.existOrFail('visualizeSaveButton', { timeout: 10000 }); }); it('Embed code shows create short-url button', async () => { @@ -162,7 +161,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa it(`landing page shows "Create new Visualization" button`, async () => { await PageObjects.visualize.gotoVisualizationLandingPage(); - await testSubjects.existOrFail('visualizeLandingPage', 10000); + await testSubjects.existOrFail('visualizeLandingPage', { timeout: 10000 }); await testSubjects.existOrFail('newItemButton'); }); @@ -175,7 +174,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('visualizationLoader', 10000); + await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 }); }); it(`can't save existing Visualization`, async () => { @@ -183,8 +182,8 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('shareTopNavButton', 10000); - await testSubjects.missingOrFail('visualizeSaveButton', 10000); + await testSubjects.existOrFail('shareTopNavButton', { timeout: 10000 }); + await testSubjects.missingOrFail('visualizeSaveButton', { timeout: 10000 }); }); it(`Embed Code doesn't show create short-url button`, async () => { @@ -241,7 +240,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`edit page redirects to home page`, async () => { @@ -249,7 +248,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts index e69878f3200dd2..c7e8811074bc13 100644 --- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts +++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; // eslint-disable-next-line max-len import { VisualizeConstants } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants'; import { SpacesService } from '../../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers'; +import { FtrProviderContext } from '../../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getPageObjects, getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const spacesService: SpacesService = getService('spaces'); const PageObjects = getPageObjects(['common', 'visualize', 'security', 'spaceSelector']); @@ -59,7 +58,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('visualizationLoader', 10000); + await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 }); }); }); @@ -96,7 +95,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa ensureCurrentUrl: false, shouldLoginIfPrompted: false, }); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`edit visualization for object which doesn't exist redirects to the home page`, async () => { @@ -109,7 +108,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); it(`edit visualization for object which exists redirects to the home page`, async () => { @@ -122,7 +121,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa shouldLoginIfPrompted: false, } ); - await testSubjects.existOrFail('homeApp', 10000); + await testSubjects.existOrFail('homeApp', { timeout: 10000 }); }); }); }); diff --git a/x-pack/test/functional/apps/visualize/index.ts b/x-pack/test/functional/apps/visualize/index.ts index 3c59bcdd77bf8f..3b35e8e8c35f0e 100644 --- a/x-pack/test/functional/apps/visualize/index.ts +++ b/x-pack/test/functional/apps/visualize/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function visualize({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function visualize({ loadTestFile }: FtrProviderContext) { describe('Visualize', function visualizeTestSuite() { this.tags(['ciGroup4', 'skipFirefox']); diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js index dc0e1b690b1b04..d106c407f9c2a4 100644 --- a/x-pack/test/functional/config.js +++ b/x-pack/test/functional/config.js @@ -8,71 +8,8 @@ import { resolve } from 'path'; -import { - CanvasPageProvider, - SecurityPageProvider, - MonitoringPageProvider, - LogstashPageProvider, - GraphPageProvider, - GrokDebuggerPageProvider, - WatcherPageProvider, - ReportingPageProvider, - SpaceSelectorPageProvider, - AccountSettingProvider, - InfraHomePageProvider, - InfraLogsPageProvider, - GisPageProvider, - StatusPagePageProvider, - UpgradeAssistantProvider, - CodeHomePageProvider, - RollupPageProvider, - UptimePageProvider, - LicenseManagementPageProvider, - IndexManagementPageProvider, - IndexLifecycleManagementPageProvider, - SnapshotRestorePageProvider, - CrossClusterReplicationPageProvider, - RemoteClustersPageProvider, -} from './page_objects'; - -import { - MonitoringNoDataProvider, - MonitoringClusterListProvider, - MonitoringClusterOverviewProvider, - MonitoringClusterAlertsProvider, - MonitoringElasticsearchSummaryStatusProvider, - MonitoringElasticsearchOverviewProvider, - MonitoringElasticsearchNodesProvider, - MonitoringElasticsearchNodeDetailProvider, - MonitoringElasticsearchIndicesProvider, - MonitoringElasticsearchIndexDetailProvider, - MonitoringElasticsearchShardsProvider, - MonitoringBeatsOverviewProvider, - MonitoringBeatsListingProvider, - MonitoringBeatDetailProvider, - MonitoringBeatsSummaryStatusProvider, - MonitoringLogstashPipelinesProvider, - MonitoringLogstashSummaryStatusProvider, - MonitoringKibanaOverviewProvider, - MonitoringKibanaInstancesProvider, - MonitoringKibanaInstanceProvider, - MonitoringKibanaSummaryStatusProvider, - PipelineListProvider, - PipelineEditorProvider, - RandomProvider, - AceEditorProvider, - GrokDebuggerProvider, - UserMenuProvider, - UptimeProvider, - InfraSourceConfigurationFlyoutProvider, - InfraLogStreamProvider, - MachineLearningProvider, -} from './services'; - -import { - SecurityServiceProvider, - SpacesServiceProvider, -} from '../common/services'; +import { services } from './services'; +import { pageObjects } from './page_objects'; // the default export of config files must be a config provider // that returns an object with the projects config values @@ -83,9 +20,6 @@ export default async function ({ readConfigFile }) { const kibanaFunctionalConfig = await readConfigFile( require.resolve('../../../test/functional/config.js') ); - const kibanaAPITestsConfig = await readConfigFile( - require.resolve('../../../test/api_integration/config.js') - ); return { // list paths to the files that contain your plugins tests @@ -125,77 +59,8 @@ export default async function ({ readConfigFile }) { resolve(__dirname, './apps/license_management'), ], - // define the name and providers for services that should be - // available to your tests. If you don't specify anything here - // only the built-in services will be available - services: { - ...kibanaFunctionalConfig.get('services'), - esSupertest: kibanaAPITestsConfig.get('services.esSupertest'), - monitoringNoData: MonitoringNoDataProvider, - monitoringClusterList: MonitoringClusterListProvider, - monitoringClusterOverview: MonitoringClusterOverviewProvider, - monitoringClusterAlerts: MonitoringClusterAlertsProvider, - monitoringElasticsearchSummaryStatus: MonitoringElasticsearchSummaryStatusProvider, - monitoringElasticsearchOverview: MonitoringElasticsearchOverviewProvider, - monitoringElasticsearchNodes: MonitoringElasticsearchNodesProvider, - monitoringElasticsearchNodeDetail: MonitoringElasticsearchNodeDetailProvider, - monitoringElasticsearchIndices: MonitoringElasticsearchIndicesProvider, - monitoringElasticsearchIndexDetail: MonitoringElasticsearchIndexDetailProvider, - monitoringElasticsearchShards: MonitoringElasticsearchShardsProvider, - monitoringBeatsOverview: MonitoringBeatsOverviewProvider, - monitoringBeatsListing: MonitoringBeatsListingProvider, - monitoringBeatDetail: MonitoringBeatDetailProvider, - monitoringBeatsSummaryStatus: MonitoringBeatsSummaryStatusProvider, - monitoringLogstashPipelines: MonitoringLogstashPipelinesProvider, - monitoringLogstashSummaryStatus: MonitoringLogstashSummaryStatusProvider, - monitoringKibanaOverview: MonitoringKibanaOverviewProvider, - monitoringKibanaInstances: MonitoringKibanaInstancesProvider, - monitoringKibanaInstance: MonitoringKibanaInstanceProvider, - monitoringKibanaSummaryStatus: MonitoringKibanaSummaryStatusProvider, - pipelineList: PipelineListProvider, - pipelineEditor: PipelineEditorProvider, - random: RandomProvider, - aceEditor: AceEditorProvider, - grokDebugger: GrokDebuggerProvider, - security: SecurityServiceProvider, - spaces: SpacesServiceProvider, - userMenu: UserMenuProvider, - uptime: UptimeProvider, - rollup: RollupPageProvider, - infraSourceConfigurationFlyout: InfraSourceConfigurationFlyoutProvider, - infraLogStream: InfraLogStreamProvider, - ml: MachineLearningProvider, - }, - - // just like services, PageObjects are defined as a map of - // names to Providers. Merge in Kibana's or pick specific ones - pageObjects: { - ...kibanaFunctionalConfig.get('pageObjects'), - canvas: CanvasPageProvider, - security: SecurityPageProvider, - accountSetting: AccountSettingProvider, - monitoring: MonitoringPageProvider, - logstash: LogstashPageProvider, - graph: GraphPageProvider, - grokDebugger: GrokDebuggerPageProvider, - watcher: WatcherPageProvider, - reporting: ReportingPageProvider, - spaceSelector: SpaceSelectorPageProvider, - infraHome: InfraHomePageProvider, - infraLogs: InfraLogsPageProvider, - maps: GisPageProvider, - statusPage: StatusPagePageProvider, - upgradeAssistant: UpgradeAssistantProvider, - code: CodeHomePageProvider, - uptime: UptimePageProvider, - rollup: RollupPageProvider, - licenseManagement: LicenseManagementPageProvider, - indexManagement: IndexManagementPageProvider, - indexLifecycleManagement: IndexLifecycleManagementPageProvider, - snapshotRestore: SnapshotRestorePageProvider, - crossClusterReplication: CrossClusterReplicationPageProvider, - remoteClusters: RemoteClustersPageProvider - }, + services, + pageObjects, servers: kibanaFunctionalConfig.get('servers'), diff --git a/x-pack/test/functional/ftr_provider_context.d.ts b/x-pack/test/functional/ftr_provider_context.d.ts new file mode 100644 index 00000000000000..bb257cdcbfe1b5 --- /dev/null +++ b/x-pack/test/functional/ftr_provider_context.d.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { pageObjects } from './page_objects'; +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/functional/page_objects/canvas_page.ts b/x-pack/test/functional/page_objects/canvas_page.ts index 38672dd7d31157..78863f91451f6a 100644 --- a/x-pack/test/functional/page_objects/canvas_page.ts +++ b/x-pack/test/functional/page_objects/canvas_page.ts @@ -6,9 +6,9 @@ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export function CanvasPageProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function CanvasPageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const find = getService('find'); diff --git a/x-pack/test/functional/page_objects/code_page.ts b/x-pack/test/functional/page_objects/code_page.ts index 203902dcc1b138..5494f2e82569ce 100644 --- a/x-pack/test/functional/page_objects/code_page.ts +++ b/x-pack/test/functional/page_objects/code_page.ts @@ -8,9 +8,9 @@ // import Keys from 'leadfoot/keys'; // import moment from 'moment'; -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export function CodeHomePageProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function CodeHomePageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const log = getService('log'); const queryBar = getService('queryBar'); diff --git a/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts b/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts index 256a9b483f1d4f..e884d200a0759a 100644 --- a/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts +++ b/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts @@ -4,11 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const CrossClusterReplicationPageProvider = ({ - getService, -}: KibanaFunctionalTestDefaultProviders) => { +export function CrossClusterReplicationPageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); return { @@ -19,4 +17,4 @@ export const CrossClusterReplicationPageProvider = ({ return await testSubjects.find('createFollowerIndexButton'); }, }; -}; +} diff --git a/x-pack/test/functional/page_objects/index.js b/x-pack/test/functional/page_objects/index.js deleted file mode 100644 index e3ecab8df9596c..00000000000000 --- a/x-pack/test/functional/page_objects/index.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export { CanvasPageProvider } from './canvas_page'; -export { SecurityPageProvider } from './security_page'; -export { MonitoringPageProvider } from './monitoring_page'; -export { LogstashPageProvider } from './logstash_page'; -export { GraphPageProvider } from './graph_page'; -export { GrokDebuggerPageProvider } from './grok_debugger_page'; -export { WatcherPageProvider } from './watcher_page'; -export { ReportingPageProvider } from './reporting_page'; -export { SpaceSelectorPageProvider } from './space_selector_page'; -export { AccountSettingProvider } from './accountsetting_page'; -export { InfraHomePageProvider } from './infra_home_page'; -export { InfraLogsPageProvider } from './infra_logs_page'; -export { GisPageProvider } from './gis_page'; -export { StatusPagePageProvider } from './status_page'; -export { UpgradeAssistantProvider } from './upgrade_assistant'; -export { CodeHomePageProvider } from './code_page'; -export { RollupPageProvider } from './rollup_page'; -export { UptimePageProvider } from './uptime_page'; -export { LicenseManagementPageProvider } from './license_management_page'; -export { IndexManagementPageProvider } from './index_management_page'; -export { IndexLifecycleManagementPageProvider } from './index_lifecycle_management_page'; -export { SnapshotRestorePageProvider } from './snapshot_restore_page'; -export { CrossClusterReplicationPageProvider } from './cross_cluster_replication_page'; -export { RemoteClustersPageProvider } from './remote_clusters_page'; diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts new file mode 100644 index 00000000000000..c80b8c76c639cd --- /dev/null +++ b/x-pack/test/functional/page_objects/index.ts @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { pageObjects as kibanaFunctionalPageObjects } from '../../../../test/functional/page_objects'; + +import { CanvasPageProvider } from './canvas_page'; +// @ts-ignore not ts yet +import { SecurityPageProvider } from './security_page'; +// @ts-ignore not ts yet +import { MonitoringPageProvider } from './monitoring_page'; +// @ts-ignore not ts yet +import { LogstashPageProvider } from './logstash_page'; +// @ts-ignore not ts yet +import { GraphPageProvider } from './graph_page'; +// @ts-ignore not ts yet +import { GrokDebuggerPageProvider } from './grok_debugger_page'; +// @ts-ignore not ts yet +import { WatcherPageProvider } from './watcher_page'; +// @ts-ignore not ts yet +import { ReportingPageProvider } from './reporting_page'; +// @ts-ignore not ts yet +import { SpaceSelectorPageProvider } from './space_selector_page'; +// @ts-ignore not ts yet +import { AccountSettingProvider } from './accountsetting_page'; +import { InfraHomePageProvider } from './infra_home_page'; +import { InfraLogsPageProvider } from './infra_logs_page'; +// @ts-ignore not ts yet +import { GisPageProvider } from './gis_page'; +// @ts-ignore not ts yet +import { StatusPagePageProvider } from './status_page'; +// @ts-ignore not ts yet +import { UpgradeAssistantProvider } from './upgrade_assistant'; +import { CodeHomePageProvider } from './code_page'; +// @ts-ignore not ts yet +import { RollupPageProvider } from './rollup_page'; +import { UptimePageProvider } from './uptime_page'; +import { LicenseManagementPageProvider } from './license_management_page'; +import { IndexManagementPageProvider } from './index_management_page'; +import { IndexLifecycleManagementPageProvider } from './index_lifecycle_management_page'; +import { SnapshotRestorePageProvider } from './snapshot_restore_page'; +import { CrossClusterReplicationPageProvider } from './cross_cluster_replication_page'; +import { RemoteClustersPageProvider } from './remote_clusters_page'; + +// just like services, PageObjects are defined as a map of +// names to Providers. Merge in Kibana's or pick specific ones +export const pageObjects = { + ...kibanaFunctionalPageObjects, + canvas: CanvasPageProvider, + security: SecurityPageProvider, + accountSetting: AccountSettingProvider, + monitoring: MonitoringPageProvider, + logstash: LogstashPageProvider, + graph: GraphPageProvider, + grokDebugger: GrokDebuggerPageProvider, + watcher: WatcherPageProvider, + reporting: ReportingPageProvider, + spaceSelector: SpaceSelectorPageProvider, + infraHome: InfraHomePageProvider, + infraLogs: InfraLogsPageProvider, + maps: GisPageProvider, + statusPage: StatusPagePageProvider, + upgradeAssistant: UpgradeAssistantProvider, + code: CodeHomePageProvider, + uptime: UptimePageProvider, + rollup: RollupPageProvider, + licenseManagement: LicenseManagementPageProvider, + indexManagement: IndexManagementPageProvider, + indexLifecycleManagement: IndexLifecycleManagementPageProvider, + snapshotRestore: SnapshotRestorePageProvider, + crossClusterReplication: CrossClusterReplicationPageProvider, + remoteClusters: RemoteClustersPageProvider, +}; diff --git a/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts b/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts index fac6f5a48101aa..3a8ff4bd2b86f2 100644 --- a/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts +++ b/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts @@ -4,11 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const IndexLifecycleManagementPageProvider = ({ - getService, -}: KibanaFunctionalTestDefaultProviders) => { +export function IndexLifecycleManagementPageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); return { @@ -19,4 +17,4 @@ export const IndexLifecycleManagementPageProvider = ({ return await testSubjects.find('createPolicyButton'); }, }; -}; +} diff --git a/x-pack/test/functional/page_objects/index_management_page.ts b/x-pack/test/functional/page_objects/index_management_page.ts index 409272e61bd326..a8e02b6e7e8054 100644 --- a/x-pack/test/functional/page_objects/index_management_page.ts +++ b/x-pack/test/functional/page_objects/index_management_page.ts @@ -4,11 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const IndexManagementPageProvider = ({ - getService, -}: KibanaFunctionalTestDefaultProviders) => { +export function IndexManagementPageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); return { @@ -19,4 +17,4 @@ export const IndexManagementPageProvider = ({ return await testSubjects.find('reloadIndicesButton'); }, }; -}; +} diff --git a/x-pack/test/functional/page_objects/infra_home_page.ts b/x-pack/test/functional/page_objects/infra_home_page.ts index e9e960a62642d5..479468d1f82c66 100644 --- a/x-pack/test/functional/page_objects/infra_home_page.ts +++ b/x-pack/test/functional/page_objects/infra_home_page.ts @@ -6,9 +6,9 @@ import testSubjSelector from '@kbn/test-subj-selector'; -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export function InfraHomePageProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function InfraHomePageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const find = getService('find'); const browser = getService('browser'); diff --git a/x-pack/test/functional/page_objects/infra_logs_page.ts b/x-pack/test/functional/page_objects/infra_logs_page.ts index 696995fb716d8f..f38740dbb6d131 100644 --- a/x-pack/test/functional/page_objects/infra_logs_page.ts +++ b/x-pack/test/functional/page_objects/infra_logs_page.ts @@ -7,12 +7,9 @@ // import testSubjSelector from '@kbn/test-subj-selector'; // import moment from 'moment'; -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export function InfraLogsPageProvider({ - getPageObjects, - getService, -}: KibanaFunctionalTestDefaultProviders) { +export function InfraLogsPageProvider({ getPageObjects, getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const pageObjects = getPageObjects(['common']); diff --git a/x-pack/test/functional/page_objects/license_management_page.ts b/x-pack/test/functional/page_objects/license_management_page.ts index bbc0843587bf9b..ee49ecc6ad56e4 100644 --- a/x-pack/test/functional/page_objects/license_management_page.ts +++ b/x-pack/test/functional/page_objects/license_management_page.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const LicenseManagementPageProvider = ({ - getService, - getPageObjects, -}: KibanaFunctionalTestDefaultProviders) => { +export function LicenseManagementPageProvider({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'header']); const testSubjects = getService('testSubjects'); const retry = getService('retry'); @@ -38,4 +35,4 @@ export const LicenseManagementPageProvider = ({ await PageObjects.header.waitUntilLoadingHasFinished(); }, }; -}; +} diff --git a/x-pack/test/functional/page_objects/remote_clusters_page.ts b/x-pack/test/functional/page_objects/remote_clusters_page.ts index 36519b8668c69d..afa83c1df27d02 100644 --- a/x-pack/test/functional/page_objects/remote_clusters_page.ts +++ b/x-pack/test/functional/page_objects/remote_clusters_page.ts @@ -4,11 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const RemoteClustersPageProvider = ({ - getService, -}: KibanaFunctionalTestDefaultProviders) => { +export function RemoteClustersPageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); return { @@ -16,4 +14,4 @@ export const RemoteClustersPageProvider = ({ return await testSubjects.find('remoteClusterEmptyPromptCreateButton'); }, }; -}; +} diff --git a/x-pack/test/functional/page_objects/snapshot_restore_page.ts b/x-pack/test/functional/page_objects/snapshot_restore_page.ts index d5d004693d8e30..25bdfc70757272 100644 --- a/x-pack/test/functional/page_objects/snapshot_restore_page.ts +++ b/x-pack/test/functional/page_objects/snapshot_restore_page.ts @@ -4,11 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const SnapshotRestorePageProvider = ({ - getService, -}: KibanaFunctionalTestDefaultProviders) => { +export function SnapshotRestorePageProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); return { @@ -19,4 +17,4 @@ export const SnapshotRestorePageProvider = ({ return await testSubjects.find('registerRepositoryButton'); }, }; -}; +} diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts index 42c4625e98678c..5429463623aaa3 100644 --- a/x-pack/test/functional/page_objects/uptime_page.ts +++ b/x-pack/test/functional/page_objects/uptime_page.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const UptimePageProvider = ({ - getPageObjects, - getService, -}: KibanaFunctionalTestDefaultProviders) => { +export function UptimePageProvider({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects(['common', 'timePicker']); const uptimeService = getService('uptime'); @@ -49,4 +46,4 @@ export const UptimePageProvider = ({ await uptimeService.monitorIdExists('monitor-page-link-auto-http-0X131221E73F825974'); } })(); -}; +} diff --git a/x-pack/test/functional/services/index.js b/x-pack/test/functional/services/index.js deleted file mode 100644 index 126623e35ad059..00000000000000 --- a/x-pack/test/functional/services/index.js +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export * from './monitoring'; -export { PipelineListProvider } from './pipeline_list'; -export { PipelineEditorProvider } from './pipeline_editor'; -export { RandomProvider } from './random'; -export { AceEditorProvider } from './ace_editor'; -export { GrokDebuggerProvider } from './grok_debugger'; -export { UserMenuProvider } from './user_menu'; -export { UptimeProvider } from './uptime'; -export { InfraSourceConfigurationFlyoutProvider } from './infra_source_configuration_flyout'; -export { InfraLogStreamProvider } from './infra_log_stream'; -export { MachineLearningProvider } from './machine_learning'; diff --git a/x-pack/test/functional/services/index.ts b/x-pack/test/functional/services/index.ts new file mode 100644 index 00000000000000..87e27a5955571a --- /dev/null +++ b/x-pack/test/functional/services/index.ts @@ -0,0 +1,92 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { services as kibanaFunctionalServices } from '../../../../test/functional/services'; +import { services as kibanaApiIntegrationServices } from '../../../../test/api_integration/services'; + +import { + MonitoringNoDataProvider, + MonitoringClusterListProvider, + MonitoringClusterOverviewProvider, + MonitoringClusterAlertsProvider, + MonitoringElasticsearchSummaryStatusProvider, + MonitoringElasticsearchOverviewProvider, + MonitoringElasticsearchNodesProvider, + MonitoringElasticsearchNodeDetailProvider, + MonitoringElasticsearchIndicesProvider, + MonitoringElasticsearchIndexDetailProvider, + MonitoringElasticsearchShardsProvider, + MonitoringBeatsOverviewProvider, + MonitoringBeatsListingProvider, + MonitoringBeatDetailProvider, + MonitoringBeatsSummaryStatusProvider, + MonitoringLogstashPipelinesProvider, + MonitoringLogstashSummaryStatusProvider, + MonitoringKibanaOverviewProvider, + MonitoringKibanaInstancesProvider, + MonitoringKibanaInstanceProvider, + MonitoringKibanaSummaryStatusProvider, + // @ts-ignore not ts yet +} from './monitoring'; +// @ts-ignore not ts yet +import { PipelineListProvider } from './pipeline_list'; +// @ts-ignore not ts yet +import { PipelineEditorProvider } from './pipeline_editor'; +// @ts-ignore not ts yet +import { RandomProvider } from './random'; +// @ts-ignore not ts yet +import { AceEditorProvider } from './ace_editor'; +// @ts-ignore not ts yet +import { GrokDebuggerProvider } from './grok_debugger'; +// @ts-ignore not ts yet +import { UserMenuProvider } from './user_menu'; +import { UptimeProvider } from './uptime'; +import { InfraSourceConfigurationFlyoutProvider } from './infra_source_configuration_flyout'; +import { InfraLogStreamProvider } from './infra_log_stream'; +import { MachineLearningProvider } from './machine_learning'; + +import { SecurityServiceProvider, SpacesServiceProvider } from '../../common/services'; + +// define the name and providers for services that should be +// available to your tests. If you don't specify anything here +// only the built-in services will be available +export const services = { + ...kibanaFunctionalServices, + esSupertest: kibanaApiIntegrationServices.esSupertest, + monitoringNoData: MonitoringNoDataProvider, + monitoringClusterList: MonitoringClusterListProvider, + monitoringClusterOverview: MonitoringClusterOverviewProvider, + monitoringClusterAlerts: MonitoringClusterAlertsProvider, + monitoringElasticsearchSummaryStatus: MonitoringElasticsearchSummaryStatusProvider, + monitoringElasticsearchOverview: MonitoringElasticsearchOverviewProvider, + monitoringElasticsearchNodes: MonitoringElasticsearchNodesProvider, + monitoringElasticsearchNodeDetail: MonitoringElasticsearchNodeDetailProvider, + monitoringElasticsearchIndices: MonitoringElasticsearchIndicesProvider, + monitoringElasticsearchIndexDetail: MonitoringElasticsearchIndexDetailProvider, + monitoringElasticsearchShards: MonitoringElasticsearchShardsProvider, + monitoringBeatsOverview: MonitoringBeatsOverviewProvider, + monitoringBeatsListing: MonitoringBeatsListingProvider, + monitoringBeatDetail: MonitoringBeatDetailProvider, + monitoringBeatsSummaryStatus: MonitoringBeatsSummaryStatusProvider, + monitoringLogstashPipelines: MonitoringLogstashPipelinesProvider, + monitoringLogstashSummaryStatus: MonitoringLogstashSummaryStatusProvider, + monitoringKibanaOverview: MonitoringKibanaOverviewProvider, + monitoringKibanaInstances: MonitoringKibanaInstancesProvider, + monitoringKibanaInstance: MonitoringKibanaInstanceProvider, + monitoringKibanaSummaryStatus: MonitoringKibanaSummaryStatusProvider, + pipelineList: PipelineListProvider, + pipelineEditor: PipelineEditorProvider, + random: RandomProvider, + aceEditor: AceEditorProvider, + grokDebugger: GrokDebuggerProvider, + security: SecurityServiceProvider, + spaces: SpacesServiceProvider, + userMenu: UserMenuProvider, + uptime: UptimeProvider, + infraSourceConfigurationFlyout: InfraSourceConfigurationFlyoutProvider, + infraLogStream: InfraLogStreamProvider, + ml: MachineLearningProvider, +}; diff --git a/x-pack/test/functional/services/infra_log_stream.ts b/x-pack/test/functional/services/infra_log_stream.ts index c5bf85af057897..265c4b8d13b3c0 100644 --- a/x-pack/test/functional/services/infra_log_stream.ts +++ b/x-pack/test/functional/services/infra_log_stream.ts @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper'; -export function InfraLogStreamProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function InfraLogStreamProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); return { diff --git a/x-pack/test/functional/services/infra_source_configuration_flyout.ts b/x-pack/test/functional/services/infra_source_configuration_flyout.ts index 4d84e701bc55d7..fb77e2dced0458 100644 --- a/x-pack/test/functional/services/infra_source_configuration_flyout.ts +++ b/x-pack/test/functional/services/infra_source_configuration_flyout.ts @@ -4,12 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper'; -export function InfraSourceConfigurationFlyoutProvider({ - getService, -}: KibanaFunctionalTestDefaultProviders) { +export function InfraSourceConfigurationFlyoutProvider({ getService }: FtrProviderContext) { const find = getService('find'); const retry = getService('retry'); const testSubjects = getService('testSubjects'); diff --git a/x-pack/test/functional/services/machine_learning.ts b/x-pack/test/functional/services/machine_learning.ts index d2ee72667e9f82..1e62d1bb612656 100644 --- a/x-pack/test/functional/services/machine_learning.ts +++ b/x-pack/test/functional/services/machine_learning.ts @@ -4,12 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export function MachineLearningProvider({ - getService, - getPageObjects, -}: KibanaFunctionalTestDefaultProviders) { +export function MachineLearningProvider({ getService, getPageObjects }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const PageObjects = getPageObjects(['common']); diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts index 919b5aa4dcc78d..fd1a61da2c0f59 100644 --- a/x-pack/test/functional/services/uptime.ts +++ b/x-pack/test/functional/services/uptime.ts @@ -4,11 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -export const UptimeProvider = ({ getService }: KibanaFunctionalTestDefaultProviders) => { +export function UptimeProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const browser = getService('browser'); + return { async assertExists(key: string) { if (!(await testSubjects.exists(key))) { @@ -30,4 +31,4 @@ export const UptimeProvider = ({ getService }: KibanaFunctionalTestDefaultProvid await browser.pressKeys(browser.keys.ENTER); }, }; -}; +} diff --git a/x-pack/test/kerberos_api_integration/anonymous_access.config.ts b/x-pack/test/kerberos_api_integration/anonymous_access.config.ts index 4ec217ec955919..90d47ec61a4dc9 100644 --- a/x-pack/test/kerberos_api_integration/anonymous_access.config.ts +++ b/x-pack/test/kerberos_api_integration/anonymous_access.config.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../types/providers'; +import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; -// eslint-disable-next-line import/no-default-export -export default async function({ readConfigFile }: KibanaFunctionalTestDefaultProviders) { +export default async function({ readConfigFile }: FtrConfigProviderContext) { const kerberosAPITestsConfig = await readConfigFile(require.resolve('./config.ts')); return { diff --git a/x-pack/test/kerberos_api_integration/apis/index.ts b/x-pack/test/kerberos_api_integration/apis/index.ts index 5905edfcf59a19..00818c2b59eee7 100644 --- a/x-pack/test/kerberos_api_integration/apis/index.ts +++ b/x-pack/test/kerberos_api_integration/apis/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; +import { FtrProviderContext } from '../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('apis Kerberos', function() { this.tags('ciGroup6'); loadTestFile(require.resolve('./security')); diff --git a/x-pack/test/kerberos_api_integration/apis/security/index.ts b/x-pack/test/kerberos_api_integration/apis/security/index.ts index 3442d4ead16564..5d221b796ca24b 100644 --- a/x-pack/test/kerberos_api_integration/apis/security/index.ts +++ b/x-pack/test/kerberos_api_integration/apis/security/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('security', () => { loadTestFile(require.resolve('./kerberos_login')); }); 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 a05c51b85e4f16..0a3b7f595c66d3 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 @@ -7,10 +7,9 @@ import expect from '@kbn/expect'; import request, { Cookie } from 'request'; import { delay } from 'bluebird'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const spnegoToken = 'YIIChwYGKwYBBQUCoIICezCCAnegDTALBgkqhkiG9xIBAgKiggJkBIICYGCCAlwGCSqGSIb3EgECAgEAboICSzCCAkegAwIBBaEDAgEOogcDBQAAAAAAo4IBW2GCAVcwggFToAMCAQWhERsPVEVTVC5FTEFTVElDLkNPohwwGqADAgEDoRMwERsESFRUUBsJbG9jYWxob3N0o4IBGTCCARWgAwIBEqEDAgECooIBBwSCAQNBN2a1Rso+KEJsDwICYLCt7ACLzdlbhEZF5YNsehO109b/WiZR1VTK6kCQyDdBdQFefyvV8EiC35mz7XnTb239nWz6xBGbdmtjSfF0XzpXKbL/zGzLEKkEXQuqFLPUN6qEJXsh0OoNdj9OWwmTr93FVyugs1hO/E5wjlAe2SDYpBN6uZICXu6dFg9nLQKkb/XgbgKM7ZZvgA/UElWDgHav4nPO1VWppCCLKHqXTRnvpr/AsxeON4qeJLaukxBigfIaJlLFMNQal5H7MyXa0j3Y1sckbURnWoBt6r4XE7c8F8cz0rYoGwoCO+Cs5tNutKY6XcsAFbLh59hjgIkhVBhhyTeypIHSMIHPoAMCARKigccEgcSsXqIRAcHfZivrbHfsnvbFgmzmnrKVPFNtJ9Hl23KunCsNW49nP4VF2dEf9n12prDaIguJDV5LPHpTew9rmCj1GCahKJ9bJbRKIgImLFd+nelm3E2zxRqAhrgM1469oDg0ksE3+5lJBuJlVEECMp0F/gxvEiL7DhasICqw+FOJ/jD9QUYvg+E6BIxWgZyPszaxerzBBszAhIF1rxCHRRL1KLjskNeJlBhH77DkAO6AEmsYGdsgEq7b7uCov9PKPiiPAuFF'; const supertest = getService('supertestWithoutAuth'); diff --git a/x-pack/test/kerberos_api_integration/config.ts b/x-pack/test/kerberos_api_integration/config.ts index f104c5cae190ea..a1e1466ae40ed3 100644 --- a/x-pack/test/kerberos_api_integration/config.ts +++ b/x-pack/test/kerberos_api_integration/config.ts @@ -5,10 +5,10 @@ */ import { resolve } from 'path'; -import { KibanaFunctionalTestDefaultProviders } from '../types/providers'; +import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { services } from './services'; -// eslint-disable-next-line import/no-default-export -export default async function({ readConfigFile }: KibanaFunctionalTestDefaultProviders) { +export default async function({ readConfigFile }: FtrConfigProviderContext) { const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.js')); const kerberosKeytabPath = resolve( @@ -23,11 +23,7 @@ export default async function({ readConfigFile }: KibanaFunctionalTestDefaultPro return { testFiles: [require.resolve('./apis')], servers: xPackAPITestsConfig.get('servers'), - services: { - es: xPackAPITestsConfig.get('services.es'), - esSupertest: xPackAPITestsConfig.get('services.esSupertest'), - supertestWithoutAuth: xPackAPITestsConfig.get('services.supertestWithoutAuth'), - }, + services, junit: { reportName: 'X-Pack Kerberos API Integration Tests', }, diff --git a/x-pack/test/kerberos_api_integration/ftr_provider_context.d.ts b/x-pack/test/kerberos_api_integration/ftr_provider_context.d.ts new file mode 100644 index 00000000000000..e3add3748f56d7 --- /dev/null +++ b/x-pack/test/kerberos_api_integration/ftr_provider_context.d.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/kerberos_api_integration/services.ts b/x-pack/test/kerberos_api_integration/services.ts new file mode 100644 index 00000000000000..42505994e06029 --- /dev/null +++ b/x-pack/test/kerberos_api_integration/services.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { services as apiIntegrationServices } from '../api_integration/services'; + +export const services = { + es: apiIntegrationServices.es, + esSupertest: apiIntegrationServices.esSupertest, + supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth, +}; diff --git a/x-pack/test/types/mocha_decorations.d.ts b/x-pack/test/mocha_decorations.d.ts similarity index 100% rename from x-pack/test/types/mocha_decorations.d.ts rename to x-pack/test/mocha_decorations.d.ts diff --git a/x-pack/test/plugin_api_integration/config.js b/x-pack/test/plugin_api_integration/config.js index 0fb38f5a5bb6f7..1097cc3ab56aa3 100644 --- a/x-pack/test/plugin_api_integration/config.js +++ b/x-pack/test/plugin_api_integration/config.js @@ -6,10 +6,10 @@ import path from 'path'; import fs from 'fs'; +import { services } from './services'; export default async function ({ readConfigFile }) { const integrationConfig = await readConfigFile(require.resolve('../api_integration/config')); - const kibanaFunctionalConfig = await readConfigFile(require.resolve('../../../test/functional/config.js')); // Find all folders in ./plugins since we treat all them as plugin folder const allFiles = fs.readdirSync(path.resolve(__dirname, 'plugins')); @@ -20,11 +20,7 @@ export default async function ({ readConfigFile }) { require.resolve('./test_suites/task_manager'), require.resolve('./test_suites/encrypted_saved_objects'), ], - services: { - retry: kibanaFunctionalConfig.get('services.retry'), - ...integrationConfig.get('services'), - }, - pageObjects: integrationConfig.get('pageObjects'), + services, servers: integrationConfig.get('servers'), esTestCluster: integrationConfig.get('esTestCluster'), apps: integrationConfig.get('apps'), diff --git a/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts b/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts new file mode 100644 index 00000000000000..e3add3748f56d7 --- /dev/null +++ b/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/types/services.d.ts b/x-pack/test/plugin_api_integration/services.ts similarity index 78% rename from x-pack/test/types/services.d.ts rename to x-pack/test/plugin_api_integration/services.ts index a219e43ebd9560..b7398349cce5da 100644 --- a/x-pack/test/types/services.d.ts +++ b/x-pack/test/plugin_api_integration/services.ts @@ -4,6 +4,4 @@ * you may not use this file except in compliance with the Elastic License. */ -export interface LogService { - debug: (message: string) => void; -} +export { services } from '../api_integration/services'; diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts index 40563f5c068c3b..e984d2bbcb8bb9 100644 --- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts +++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts @@ -6,10 +6,9 @@ import expect from '@kbn/expect'; import { SavedObject } from 'src/core/server'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function({ getService }: FtrProviderContext) { const es = getService('es'); const chance = getService('chance'); const supertest = getService('supertest'); diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts index ec985711ad90db..834e0225d0fb6c 100644 --- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts +++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) { +export default function({ loadTestFile }: FtrProviderContext) { describe('encrypted_saved_objects', function encryptedSavedObjectsSuite() { this.tags('ciGroup2'); loadTestFile(require.resolve('./encrypted_saved_objects_api')); diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts index 8c2a99b975011b..dda7934ce875ad 100644 --- a/x-pack/test/saved_object_api_integration/common/config.ts +++ b/x-pack/test/saved_object_api_integration/common/config.ts @@ -6,10 +6,9 @@ // @ts-ignore import { resolveKibanaPath } from '@kbn/plugin-helpers'; +import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; import path from 'path'; -import { TestInvoker } from './lib/types'; -// @ts-ignore -import { EsProvider } from './services/es'; +import { services } from './services'; interface CreateTestConfigOptions { license: string; @@ -19,7 +18,7 @@ interface CreateTestConfigOptions { export function createTestConfig(name: string, options: CreateTestConfigOptions) { const { license = 'trial', disabledPlugins = [] } = options; - return async ({ readConfigFile }: TestInvoker) => { + return async ({ readConfigFile }: FtrConfigProviderContext) => { const config = { kibana: { api: await readConfigFile(resolveKibanaPath('test/api_integration/config.js')), @@ -33,14 +32,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) return { testFiles: [require.resolve(`../${name}/apis/`)], servers: config.xpack.api.get('servers'), - services: { - es: EsProvider, - esSupertestWithoutAuth: config.xpack.api.get('services.esSupertestWithoutAuth'), - supertest: config.kibana.api.get('services.supertest'), - supertestWithoutAuth: config.xpack.api.get('services.supertestWithoutAuth'), - esArchiver: config.kibana.functional.get('services.esArchiver'), - kibanaServer: config.kibana.functional.get('services.kibanaServer'), - }, + services, junit: { reportName: 'X-Pack Saved Object API Integration Tests -- ' + name, }, diff --git a/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts new file mode 100644 index 00000000000000..e3add3748f56d7 --- /dev/null +++ b/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/saved_object_api_integration/common/lib/types.ts b/x-pack/test/saved_object_api_integration/common/lib/types.ts index fc6d3d8745fb93..487afff1494c0d 100644 --- a/x-pack/test/saved_object_api_integration/common/lib/types.ts +++ b/x-pack/test/saved_object_api_integration/common/lib/types.ts @@ -10,15 +10,3 @@ export interface TestDefinitionAuthentication { username?: string; password?: string; } - -export type LoadTestFileFn = (path: string) => string; - -export type GetServiceFn = (service: string) => any; - -export type ReadConfigFileFn = (path: string) => any; - -export interface TestInvoker { - getService: GetServiceFn; - loadTestFile: LoadTestFileFn; - readConfigFile: ReadConfigFileFn; -} diff --git a/x-pack/test/saved_object_api_integration/common/services/index.ts b/x-pack/test/saved_object_api_integration/common/services/index.ts new file mode 100644 index 00000000000000..7c201af3ef4699 --- /dev/null +++ b/x-pack/test/saved_object_api_integration/common/services/index.ts @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore not ts yet +import { EsProvider } from './es'; + +import { services as apiIntegrationServices } from '../../../api_integration/services'; +import { services as kibanaApiIntegrationServices } from '../../../../../test/api_integration/services'; +import { services as kibanaFunctionalServices } from '../../../../../test/functional/services'; + +export const services = { + es: EsProvider, + esSupertestWithoutAuth: apiIntegrationServices.esSupertestWithoutAuth, + supertest: kibanaApiIntegrationServices.supertest, + supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth, + esArchiver: kibanaFunctionalServices.esArchiver, + kibanaServer: kibanaFunctionalServices.kibanaServer, +}; diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts index 74a333151ced13..7e00d0a9d7f759 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts index 41651e4ea744e5..ec5bce17075697 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts index a4013c8faf0f5c..4cc94bf21f235d 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { createTestSuiteFactory } from '../../common/suites/create'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertestWithoutAuth = getService('supertestWithoutAuth'); const es = getService('es'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts index 2507161cf787cd..bfd2112428db49 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { deleteTestSuiteFactory } from '../../common/suites/delete'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts index 50dd1dabbd2d29..b64c3ed87c35da 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { exportTestSuiteFactory } from '../../common/suites/export'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts index 6a1a60ba83e369..92e6ec850dc0e6 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { findTestSuiteFactory } from '../../common/suites/find'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts index e913ec064037c3..9667abcc5e57a0 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { getTestSuiteFactory } from '../../common/suites/get'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts index d336f65469ef4d..f9048d1493cc63 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { importTestSuiteFactory } from '../../common/suites/import'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts index f95ce1749e45cd..3aba796075cd66 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts @@ -5,10 +5,9 @@ */ import { createUsersAndRoles } from '../../common/lib/create_users_and_roles'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService, loadTestFile }: TestInvoker) { +export default function({ getService, loadTestFile }: FtrProviderContext) { const es = getService('es'); const supertest = getService('supertest'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts index 1ff7414b702f94..fa070ac76ce572 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts index 13bc58ac002743..8eb06e41e2a41f 100644 --- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts +++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts @@ -6,11 +6,10 @@ import { AUTHENTICATION } from '../../common/lib/authentication'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { updateTestSuiteFactory } from '../../common/suites/update'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts index 9f6087b9a56998..2a5757fb0cc579 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts index 11b9ec6fc53afe..fde98694fe5753 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/create.ts index f80d0ef8516293..bb2bf7e0e0d7ad 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/create.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/create.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { createTestSuiteFactory } from '../../common/suites/create'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertestWithoutAuth = getService('supertestWithoutAuth'); const es = getService('es'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts b/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts index 79765b37fd8062..f775b5a365d6b0 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { deleteTestSuiteFactory } from '../../common/suites/delete'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts index f6e1d033218d74..2a2c3a9b90b08f 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { exportTestSuiteFactory } from '../../common/suites/export'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/find.ts b/x-pack/test/saved_object_api_integration/security_only/apis/find.ts index 3d14f7b945a2b9..d17dbe6e7b1edd 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/find.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/find.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { findTestSuiteFactory } from '../../common/suites/find'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/get.ts b/x-pack/test/saved_object_api_integration/security_only/apis/get.ts index 91c9f7cb5cf8e9..2a31463fce8b2e 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/get.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/get.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { getTestSuiteFactory } from '../../common/suites/get'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts index c988b4d006ac74..8ad7e070edf546 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { importTestSuiteFactory } from '../../common/suites/import'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts index f08c996d4fd672..fadefd2743b30a 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts @@ -5,10 +5,9 @@ */ import { createUsersAndRoles } from '../../common/lib/create_users_and_roles'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ getService, loadTestFile }: TestInvoker) { +export default function({ getService, loadTestFile }: FtrProviderContext) { const es = getService('es'); const supertest = getService('supertest'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts index 08b7a15c292b7f..e1d72f8641e936 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/update.ts b/x-pack/test/saved_object_api_integration/security_only/apis/update.ts index d98c8ae1ef5ee7..8564296bdf5589 100644 --- a/x-pack/test/saved_object_api_integration/security_only/apis/update.ts +++ b/x-pack/test/saved_object_api_integration/security_only/apis/update.ts @@ -5,11 +5,10 @@ */ import { AUTHENTICATION } from '../../common/lib/authentication'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { updateTestSuiteFactory } from '../../common/suites/update'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertestWithoutAuth'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts index 5a1afd28d10f82..6b67c63ed349ae 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts @@ -6,7 +6,7 @@ import expect from '@kbn/expect'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create'; const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => { @@ -22,8 +22,7 @@ const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => { }); }; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts index bbe86109d981bd..bed29f8eb39a14 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts index edba7ca45f564b..d6bd0b497759fc 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts @@ -6,7 +6,7 @@ import expect from '@kbn/expect'; import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { createTestSuiteFactory } from '../../common/suites/create'; const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => { @@ -21,8 +21,7 @@ const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => { }); }; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertestWithoutAuth = getService('supertestWithoutAuth'); const es = getService('es'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts index cb08d5c12aa239..437b3f95024c61 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { deleteTestSuiteFactory } from '../../common/suites/delete'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts index 5149888424f179..f4be02c05ac88d 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { exportTestSuiteFactory } from '../../common/suites/export'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts index 7a9e459ade652d..69a2690c619788 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { findTestSuiteFactory } from '../../common/suites/find'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts index bd1c3d03a2d31e..592bedd92b4d77 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { getTestSuiteFactory } from '../../common/suites/get'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts index 1e905fee866641..c8b2e68291dc39 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { importTestSuiteFactory } from '../../common/suites/import'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts index d1f46db0a5f9db..86bc886c81e98e 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts @@ -4,10 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; -// eslint-disable-next-line import/no-default-export -export default function({ loadTestFile }: TestInvoker) { +export default function({ loadTestFile }: FtrProviderContext) { describe('saved objects spaces only enabled', function() { this.tags('ciGroup5'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts index e500f555725b0c..93d60ebbf4d6d4 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); const es = getService('es'); diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts index bc53c5a0ba7db7..6ffbda511d871f 100644 --- a/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts +++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts @@ -5,11 +5,10 @@ */ import { SPACES } from '../../common/lib/spaces'; -import { TestInvoker } from '../../common/lib/types'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { updateTestSuiteFactory } from '../../common/suites/update'; -// eslint-disable-next-line import/no-default-export -export default function({ getService }: TestInvoker) { +export default function({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/types/providers.ts b/x-pack/test/types/providers.ts deleted file mode 100644 index 34a4fc95f0bc5a..00000000000000 --- a/x-pack/test/types/providers.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { EsArchiver } from '../../../src/es_archiver'; -import { InfraLogStreamProvider } from '../functional/services/infra_log_stream'; -import { InfraSourceConfigurationFlyoutProvider } from '../functional/services/infra_source_configuration_flyout'; -import { UptimeProvider } from '../functional/services/uptime'; - -export interface KibanaFunctionalTestDefaultProviders { - getService(serviceName: 'esArchiver'): EsArchiver; - getService(serviceName: 'infraLogStream'): ReturnType; - getService( - serviceName: 'infraSourceConfigurationFlyout' - ): ReturnType; - getService(serviceName: 'uptime'): ReturnType; - getService(serviceName: string): any; - getPageObjects(pageObjectNames: string[]): any; - loadTestFile(path: string): void; - readConfigFile(path: string): any; -} diff --git a/x-pack/test/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts index bf770579ca1bd6..653aebb91fa8dc 100644 --- a/x-pack/test/ui_capabilities/common/config.ts +++ b/x-pack/test/ui_capabilities/common/config.ts @@ -5,9 +5,9 @@ */ import path from 'path'; -import { SecurityServiceProvider, SpacesServiceProvider } from '../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../types/providers'; -import { FeaturesProvider, UICapabilitiesProvider } from './services'; +import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; + +import { services } from './services'; interface CreateTestConfigOptions { license: string; @@ -18,7 +18,7 @@ interface CreateTestConfigOptions { export function createTestConfig(name: string, options: CreateTestConfigOptions) { const { license = 'trial', disabledPlugins = [] } = options; - return async ({ readConfigFile }: KibanaFunctionalTestDefaultProviders) => { + return async ({ readConfigFile }: FtrConfigProviderContext) => { const xPackFunctionalTestsConfig = await readConfigFile( require.resolve('../../functional/config.js') ); @@ -26,12 +26,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) return { testFiles: [require.resolve(`../${name}/tests/`)], servers: xPackFunctionalTestsConfig.get('servers'), - services: { - security: SecurityServiceProvider, - spaces: SpacesServiceProvider, - uiCapabilities: UICapabilitiesProvider, - features: FeaturesProvider, - }, + services, junit: { reportName: 'X-Pack UI Capabilities Functional Tests', }, diff --git a/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts b/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts new file mode 100644 index 00000000000000..e3add3748f56d7 --- /dev/null +++ b/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; + +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/ui_capabilities/common/services/features.ts b/x-pack/test/ui_capabilities/common/services/features.ts index 571dd901f1c067..774cb59292d3b6 100644 --- a/x-pack/test/ui_capabilities/common/services/features.ts +++ b/x-pack/test/ui_capabilities/common/services/features.ts @@ -6,14 +6,14 @@ import axios, { AxiosInstance } from 'axios'; import { format as formatUrl } from 'url'; import util from 'util'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; -import { LogService } from '../../../types/services'; +import { ToolingLog } from '@kbn/dev-utils'; +import { FtrProviderContext } from '../ftr_provider_context'; import { Features } from '../features'; export class FeaturesService { private readonly axios: AxiosInstance; - constructor(url: string, private readonly log: LogService) { + constructor(url: string, private readonly log: ToolingLog) { this.axios = axios.create({ headers: { 'kbn-xsrf': 'x-pack/ftr/services/features' }, baseURL: url, @@ -47,7 +47,7 @@ export class FeaturesService { } } -export function FeaturesProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function FeaturesProvider({ getService }: FtrProviderContext) { const log = getService('log'); const config = getService('config'); const url = formatUrl(config.get('servers.kibana')); diff --git a/x-pack/test/ui_capabilities/common/services/index.ts b/x-pack/test/ui_capabilities/common/services/index.ts index 9fe948d509eed1..2c36d8a4e2980f 100644 --- a/x-pack/test/ui_capabilities/common/services/index.ts +++ b/x-pack/test/ui_capabilities/common/services/index.ts @@ -4,5 +4,15 @@ * you may not use this file except in compliance with the Elastic License. */ -export { FeaturesProvider, FeaturesService } from './features'; -export { UICapabilitiesProvider } from './ui_capabilities'; +import { FeaturesProvider } from './features'; +import { UICapabilitiesProvider } from './ui_capabilities'; +import { SecurityServiceProvider, SpacesServiceProvider } from '../../../common/services'; + +export const services = { + security: SecurityServiceProvider, + spaces: SpacesServiceProvider, + uiCapabilities: UICapabilitiesProvider, + features: FeaturesProvider, +}; + +export { FeaturesService } from './features'; diff --git a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts index 3b843672acfdc2..c38bc13684e3d7 100644 --- a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts +++ b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts @@ -8,8 +8,8 @@ import cheerio from 'cheerio'; import { UICapabilities } from 'ui/capabilities'; import { format as formatUrl } from 'url'; import util from 'util'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; -import { LogService } from '../../../types/services'; +import { ToolingLog } from '@kbn/dev-utils'; +import { FtrProviderContext } from '../ftr_provider_context'; export interface BasicCredentials { username: string; @@ -28,10 +28,10 @@ interface GetUICapabilitiesResult { } export class UICapabilitiesService { - private readonly log: LogService; + private readonly log: ToolingLog; private readonly axios: AxiosInstance; - constructor(url: string, log: LogService) { + constructor(url: string, log: ToolingLog) { this.log = log; this.axios = axios.create({ headers: { 'kbn-xsrf': 'x-pack/ftr/services/ui_capabilities' }, @@ -105,7 +105,7 @@ export class UICapabilitiesService { } } -export function UICapabilitiesProvider({ getService }: KibanaFunctionalTestDefaultProviders) { +export function UICapabilitiesProvider({ getService }: FtrProviderContext) { const log = getService('log'); const config = getService('config'); const noAuthUrl = formatUrl({ 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 index 8c87914b70973d..ca27a3401cdf7d 100644 --- a/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts +++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts @@ -6,15 +6,14 @@ import expect from '@kbn/expect'; import { mapValues } from 'lodash'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { GetUICapabilitiesFailureReason, UICapabilitiesService, } from '../../common/services/ui_capabilities'; import { UserAtSpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function catalogueTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function catalogueTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); describe('catalogue', () => { diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts index 3c52d873ca8453..cd96a2192f3356 100644 --- a/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts +++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts @@ -5,15 +5,14 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { GetUICapabilitiesFailureReason, UICapabilitiesService, } from '../../common/services/ui_capabilities'; import { UserAtSpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function fooTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function fooTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); describe('foo', () => { diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts index 0ba3cba6fbc50c..e28ea819bfdfce 100644 --- a/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts +++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts @@ -6,16 +6,12 @@ import { SpacesService } from '../../../common/services'; import { SecurityService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { FeaturesService } from '../../common/services'; import { isCustomRoleSpecification } from '../../common/types'; import { Spaces, Users } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function uiCapabilitiesTests({ - loadTestFile, - getService, -}: KibanaFunctionalTestDefaultProviders) { +export default function uiCapabilitiesTests({ loadTestFile, getService }: FtrProviderContext) { const securityService: SecurityService = getService('security'); const spacesService: SpacesService = getService('spaces'); const featuresService: FeaturesService = getService('features'); 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 index 5be32e46bb03a7..9b54a1b9c925d5 100644 --- 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 @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { NavLinksBuilder } from '../../common/nav_links_builder'; import { FeaturesService } from '../../common/services'; import { @@ -14,8 +14,7 @@ import { } from '../../common/services/ui_capabilities'; import { UserAtSpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function navLinksTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function navLinksTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); const featuresService: FeaturesService = getService('features'); diff --git a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts index 9c1bf8bf0fc57e..9a46820e87f3ae 100644 --- a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts +++ b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts @@ -6,15 +6,14 @@ import expect from '@kbn/expect'; import { mapValues } from 'lodash'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { GetUICapabilitiesFailureReason, UICapabilitiesService, } from '../../common/services/ui_capabilities'; import { UserScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function catalogueTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function catalogueTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); describe('catalogue', () => { diff --git a/x-pack/test/ui_capabilities/security_only/tests/foo.ts b/x-pack/test/ui_capabilities/security_only/tests/foo.ts index f36e856e8cd47e..a2a663921e6ea9 100644 --- a/x-pack/test/ui_capabilities/security_only/tests/foo.ts +++ b/x-pack/test/ui_capabilities/security_only/tests/foo.ts @@ -5,15 +5,14 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { GetUICapabilitiesFailureReason, UICapabilitiesService, } from '../../common/services/ui_capabilities'; import { UserScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function fooTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function fooTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); describe('foo', () => { diff --git a/x-pack/test/ui_capabilities/security_only/tests/index.ts b/x-pack/test/ui_capabilities/security_only/tests/index.ts index d58ae1ef3786f9..b84c02f9d65c03 100644 --- a/x-pack/test/ui_capabilities/security_only/tests/index.ts +++ b/x-pack/test/ui_capabilities/security_only/tests/index.ts @@ -5,15 +5,11 @@ */ import { SecurityService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { isCustomRoleSpecification } from '../../common/types'; import { UserScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function uiCapabilitesTests({ - loadTestFile, - getService, -}: KibanaFunctionalTestDefaultProviders) { +export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProviderContext) { const securityService: SecurityService = getService('security'); describe('ui capabilities', function() { 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 index 3e2b3a809d73bb..f643753a5c37cd 100644 --- a/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts +++ b/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { NavLinksBuilder } from '../../common/nav_links_builder'; import { FeaturesService } from '../../common/services'; import { @@ -14,8 +14,7 @@ import { } from '../../common/services/ui_capabilities'; import { UserScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function navLinksTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function navLinksTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); const featuresService: FeaturesService = getService('features'); diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts index d6a42c2b1a2915..1625891e1732ec 100644 --- a/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts +++ b/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts @@ -6,12 +6,11 @@ import expect from '@kbn/expect'; import { mapValues } from 'lodash'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { UICapabilitiesService } from '../../common/services/ui_capabilities'; import { SpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function catalogueTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function catalogueTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); describe('catalogue', () => { diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts b/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts index 2465ab9308baff..2efd56c7d0f6db 100644 --- a/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts +++ b/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts @@ -5,12 +5,11 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { UICapabilitiesService } from '../../common/services/ui_capabilities'; import { SpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function fooTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function fooTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); describe('foo', () => { diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/index.ts b/x-pack/test/ui_capabilities/spaces_only/tests/index.ts index fd54528fa61bca..294f545c7d90f2 100644 --- a/x-pack/test/ui_capabilities/spaces_only/tests/index.ts +++ b/x-pack/test/ui_capabilities/spaces_only/tests/index.ts @@ -5,15 +5,11 @@ */ import { SpacesService } from '../../../common/services'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { FeaturesService } from '../../common/services'; import { SpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function uiCapabilitesTests({ - loadTestFile, - getService, -}: KibanaFunctionalTestDefaultProviders) { +export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProviderContext) { const spacesService: SpacesService = getService('spaces'); const featuresService: FeaturesService = getService('features'); diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts b/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts index fe08c6960da902..8be7c914b65296 100644 --- a/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts +++ b/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts @@ -5,14 +5,13 @@ */ import expect from '@kbn/expect'; -import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; import { NavLinksBuilder } from '../../common/nav_links_builder'; import { FeaturesService } from '../../common/services'; import { UICapabilitiesService } from '../../common/services/ui_capabilities'; import { SpaceScenarios } from '../scenarios'; -// eslint-disable-next-line import/no-default-export -export default function navLinksTests({ getService }: KibanaFunctionalTestDefaultProviders) { +export default function navLinksTests({ getService }: FtrProviderContext) { const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities'); const featuresService: FeaturesService = getService('features');