diff --git a/.buildkite/ftr_search_serverless_configs.yml b/.buildkite/ftr_search_serverless_configs.yml index 0ee890dc7187d..bf5272b4b0c99 100644 --- a/.buildkite/ftr_search_serverless_configs.yml +++ b/.buildkite/ftr_search_serverless_configs.yml @@ -1,13 +1,13 @@ disabled: # Base config files, only necessary to inform config finding script - x-pack/platform/test/serverless/functional/config.search.base.ts - - x-pack/test_serverless/api_integration/test_suites/search/config.ts - - x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts + - x-pack/solutions/search/test/serverless/api_integration/configs/config.ts + - x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts - x-pack/platform/test/serverless/api_integration/configs/search/config.group1.ts - - x-pack/test_serverless/functional/test_suites/search/config.ts + - x-pack/solutions/search/test/serverless/functional/configs/config.ts - x-pack/platform/test/serverless/functional/configs/search/config.examples.ts - - x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts - - x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts + - x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts + - x-pack/solutions/search/test/serverless/functional/configs/config.screenshots.ts - x-pack/platform/test/serverless/functional/configs/search/config.saved_objects_management.ts - x-pack/platform/test/serverless/functional/configs/search/config.context_awareness.ts - x-pack/platform/test/serverless/functional/configs/search/config.config_compat_mode.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a7bf14dfc903e..6601b152fb26f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1662,7 +1662,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions /src/platform/test/functional/apps/dashboard_elements/ @elastic/kibana-presentation /src/platform/test/functional/services/dashboard/ @elastic/kibana-presentation /x-pack/platform/test/functional/apps/canvas/ @elastic/kibana-presentation -/x-pack/test_serverless/functional/test_suites/search/dashboards/ @elastic/kibana-presentation +/x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/ @elastic/kibana-presentation /src/platform/test/plugin_functional/test_suites/panel_actions @elastic/kibana-presentation /x-pack/platform/test/fixtures/es_archives/canvas/logstash_lens @elastic/kibana-presentation #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation @@ -2211,12 +2211,12 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /x-pack/solutions/observability/test/api_integration/apis/cases/ @elastic/kibana-cases /x-pack/solutions/security/test/api_integration/apis/cases/ @elastic/kibana-cases /x-pack/test_serverless/functional/test_suites/observability/cases @elastic/kibana-cases -/x-pack/test_serverless/functional/test_suites/search/cases/ @elastic/kibana-cases +/x-pack/solutions/search/test/serverless/functional/test_suites/cases/ @elastic/kibana-cases /x-pack/test_serverless/functional/test_suites/security/ftr/cases/ @elastic/kibana-cases -/x-pack/test_serverless/api_integration/test_suites/search/cases/ @elastic/kibana-cases +/x-pack/solutions/search/test/serverless/api_integration/cases/ @elastic/kibana-cases /x-pack/test_serverless/api_integration/test_suites/observability/cases/ @elastic/kibana-cases /x-pack/test_serverless/api_integration/test_suites/security/cases/ @elastic/kibana-cases -/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs @elastic/response-ops +/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs @elastic/response-ops /x-pack/test_serverless/functional/test_suites/security/screenshot_creation/response_ops_docs @elastic/response-ops /x-pack/test_serverless/functional/test_suites/observability/screenshot_creation/response_ops_docs @elastic/response-ops /x-pack/platform/test/serverless/api_integration/test_suites/alerting/ @elastic/response-ops @@ -2250,11 +2250,11 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se /x-pack/test/functional/page_objects/embedded_console.ts @elastic/search-kibana /x-pack/test/functional_enterprise_search/ @elastic/search-kibana /x-pack/solutions/search/plugins/enterprise_search/public/applications/shared/doc_links @elastic/platform-docs -/x-pack/test_serverless/api_integration/test_suites/search/serverless_search @elastic/search-kibana -/x-pack/test_serverless/functional/test_suites/search/ @elastic/search-kibana -/x-pack/test_serverless/functional/test_suites/search/config.ts @elastic/search-kibana @elastic/appex-qa +/x-pack/solutions/search/test/serverless/api_integration/serverless_search @elastic/search-kibana +/x-pack/solutions/search/test/serverless/functional/test_suites/ @elastic/search-kibana +/x-pack/solutions/search/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa /x-pack/platform/test/api_integration/apis/management/index_management/inference_endpoints.ts @elastic/search-kibana -/x-pack/test_serverless/api_integration/test_suites/search @elastic/search-kibana +/x-pack/solutions/search/test/serverless/api_integration @elastic/search-kibana /x-pack/platform/test/serverless/functional/page_objects/svl_api_keys.ts @elastic/search-kibana /x-pack/test_serverless/functional/page_objects/svl_search_* @elastic/search-kibana /x-pack/solutions/search/test/functional_search/ @elastic/search-kibana diff --git a/x-pack/platform/test/serverless/functional/config.base.ts b/x-pack/platform/test/serverless/functional/config.base.ts index 10dd02ef2dbe6..7405c8d292381 100644 --- a/x-pack/platform/test/serverless/functional/config.base.ts +++ b/x-pack/platform/test/serverless/functional/config.base.ts @@ -12,9 +12,10 @@ import { pageObjects } from './page_objects'; import { services } from './services'; import type { CreateTestConfigOptions } from '../shared/types'; -export function createTestConfig( - options: CreateTestConfigOptions -) { +export function createTestConfig< + TServices extends {} = typeof services, + TPageObjects extends {} = typeof pageObjects +>(options: CreateTestConfigOptions) { return async ({ readConfigFile }: FtrConfigProviderContext) => { const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts')); @@ -22,7 +23,7 @@ export function createTestConfig( ...svlSharedConfig.getAll(), testConfigCategory: ScoutTestRunConfigCategory.UI_TEST, - pageObjects, + pageObjects: { ...pageObjects, ...options.pageObjects }, services: { ...services, ...options.services }, esTestCluster: { ...svlSharedConfig.get('esTestCluster'), diff --git a/x-pack/platform/test/serverless/functional/test_suites/platform_security/navigation/management_nav_cards.ts b/x-pack/platform/test/serverless/functional/test_suites/platform_security/navigation/management_nav_cards.ts index 6fbab5718bebf..5c946f1f259cc 100644 --- a/x-pack/platform/test/serverless/functional/test_suites/platform_security/navigation/management_nav_cards.ts +++ b/x-pack/platform/test/serverless/functional/test_suites/platform_security/navigation/management_nav_cards.ts @@ -6,7 +6,7 @@ */ // Note: this suite is currently only called from the feature flags test config: -// x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts +// x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts import expect from '@kbn/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; diff --git a/x-pack/platform/test/serverless/functional/test_suites/platform_security/roles.ts b/x-pack/platform/test/serverless/functional/test_suites/platform_security/roles.ts index ae8016ecbfca7..b302c76693aaa 100644 --- a/x-pack/platform/test/serverless/functional/test_suites/platform_security/roles.ts +++ b/x-pack/platform/test/serverless/functional/test_suites/platform_security/roles.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; // Note: this suite is currently only called from the feature flags test config: -// x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts +// x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts // This can be moved into the common config groups once custom roles are enabled // permanently in serverless. diff --git a/x-pack/platform/test/serverless/functional/test_suites/spaces/spaces_management.ts b/x-pack/platform/test/serverless/functional/test_suites/spaces/spaces_management.ts index 6d3e45cc55fd1..c5536813b9427 100644 --- a/x-pack/platform/test/serverless/functional/test_suites/spaces/spaces_management.ts +++ b/x-pack/platform/test/serverless/functional/test_suites/spaces/spaces_management.ts @@ -6,7 +6,7 @@ */ // Note: this suite is currently only called from the feature flags test config: -// x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts +// x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts // These tests can be moved to the appropriate test file (spaces_selection, // spaces_management) once multiple spaces are permanently enabled in production. diff --git a/x-pack/platform/test/serverless/shared/types/index.ts b/x-pack/platform/test/serverless/shared/types/index.ts index 9690df7ac64c0..55a6d7fd60fbc 100644 --- a/x-pack/platform/test/serverless/shared/types/index.ts +++ b/x-pack/platform/test/serverless/shared/types/index.ts @@ -6,9 +6,33 @@ */ import { ServerlessProjectType } from '@kbn/es'; -import { InheritedServices } from '../../api_integration/services'; +import { GenericFtrProviderContext } from '@kbn/test'; +import { services } from '../../api_integration/services'; +import { pageObjects } from '../../functional/page_objects'; -export interface CreateTestConfigOptions { +export type InheritedFtrProviderContext = GenericFtrProviderContext< + typeof services, + typeof pageObjects +>; + +export type InheritedServices = InheritedFtrProviderContext extends GenericFtrProviderContext< + infer TServices, + infer TPageObjects +> + ? TServices + : {}; + +export type InheritedPageObjects = InheritedFtrProviderContext extends GenericFtrProviderContext< + infer TServices, + infer TPageObjects +> + ? TPageObjects + : {}; + +export interface CreateTestConfigOptions< + TServices extends {} = InheritedServices, + TPageObjects extends {} = InheritedPageObjects +> { serverlessProject: ServerlessProjectType; esServerArgs?: string[]; kbnServerArgs?: string[]; @@ -16,5 +40,6 @@ export interface CreateTestConfigOptions; } diff --git a/x-pack/solutions/search/test/functional/config/config.feature_flags.ts b/x-pack/solutions/search/test/functional/config/config.feature_flags.ts index 707e9c4a9feed..269aeee359661 100644 --- a/x-pack/solutions/search/test/functional/config/config.feature_flags.ts +++ b/x-pack/solutions/search/test/functional/config/config.feature_flags.ts @@ -6,14 +6,18 @@ */ import { FtrConfigProviderContext } from '@kbn/test'; +import { services } from '../../functional_search/services'; +import { pageObjects } from '../../functional_search/page_objects'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xpackFunctionalConfig = await readConfigFile( - require.resolve('@kbn/test-suites-xpack/functional/config.base') + require.resolve('@kbn/test-suites-xpack-platform/functional/config.base') ); return { ...xpackFunctionalConfig.getAll(), + services, + pageObjects, junit: { reportName: 'Search Solution UI Functional Tests w/ Feature Flagged Features', }, diff --git a/x-pack/solutions/search/test/functional/ftr_provider_context.d.ts b/x-pack/solutions/search/test/functional/ftr_provider_context.d.ts index 3ab5c00f1c35a..2e1d96c18376f 100644 --- a/x-pack/solutions/search/test/functional/ftr_provider_context.d.ts +++ b/x-pack/solutions/search/test/functional/ftr_provider_context.d.ts @@ -7,7 +7,7 @@ import { GenericFtrProviderContext } from '@kbn/test'; -import { services } from '@kbn/test-suites-xpack/functional/services'; -import { pageObjects } from '@kbn/test-suites-xpack/functional/page_objects'; +import { services } from '../functional_search/services'; +import { pageObjects } from '../functional_search/page_objects'; export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/solutions/search/test/functional_search/page_objects/index.ts b/x-pack/solutions/search/test/functional_search/page_objects/index.ts index fdf86baed654f..c2b76bdce5eb9 100644 --- a/x-pack/solutions/search/test/functional_search/page_objects/index.ts +++ b/x-pack/solutions/search/test/functional_search/page_objects/index.ts @@ -14,6 +14,7 @@ import { SearchNavigationProvider } from './search_navigation'; import { SearchOverviewProvider } from './search_overview_page'; import { SearchHomePageProvider } from './search_homepage'; import { SearchPlaygroundPageProvider } from './search_playground_page'; +import { SearchQueryRulesPageProvider } from './search_query_rules_page'; export const pageObjects = { ...platformPageObjects, @@ -25,4 +26,5 @@ export const pageObjects = { searchOverview: SearchOverviewProvider, searchHomePage: SearchHomePageProvider, searchPlayground: SearchPlaygroundPageProvider, + searchQueryRules: SearchQueryRulesPageProvider, }; diff --git a/x-pack/test/functional/page_objects/search_query_rules_page.ts b/x-pack/solutions/search/test/functional_search/page_objects/search_query_rules_page.ts similarity index 100% rename from x-pack/test/functional/page_objects/search_query_rules_page.ts rename to x-pack/solutions/search/test/functional_search/page_objects/search_query_rules_page.ts diff --git a/x-pack/test/functional/page_objects/search_synonyms_page.ts b/x-pack/solutions/search/test/functional_search/page_objects/search_synonyms_page.ts similarity index 100% rename from x-pack/test/functional/page_objects/search_synonyms_page.ts rename to x-pack/solutions/search/test/functional_search/page_objects/search_synonyms_page.ts diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts b/x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts similarity index 86% rename from x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts rename to x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts index b23e6d3e93a11..8e5e21dd6fc4b 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts @@ -5,7 +5,8 @@ * 2.0. */ -import { createTestConfig } from '../../config.base'; +import { createTestConfig } from '@kbn/test-suites-xpack-platform/serverless/api_integration/config.base'; +import { services } from '../services'; /** * Make sure to create a MKI deployment with custom Kibana image, that includes feature flags arguments @@ -13,6 +14,7 @@ import { createTestConfig } from '../../config.base'; */ export default createTestConfig({ serverlessProject: 'es', + services, junit: { reportName: 'Serverless Search Feature Flags API Integration Tests', }, diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.ts b/x-pack/solutions/search/test/serverless/api_integration/configs/config.ts similarity index 88% rename from x-pack/test_serverless/api_integration/test_suites/search/config.ts rename to x-pack/solutions/search/test/serverless/api_integration/configs/config.ts index b662b105b54b5..bfa832442a332 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/config.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/configs/config.ts @@ -6,10 +6,12 @@ */ import { KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; -import { createTestConfig } from '../../config.base'; +import { createTestConfig } from '@kbn/test-suites-xpack-platform/serverless/api_integration/config.base'; +import { services } from '../services'; export default createTestConfig({ serverlessProject: 'es', + services, testFiles: [require.resolve('.')], junit: { reportName: 'Serverless Search API Integration Tests', diff --git a/x-pack/test_serverless/api_integration/test_suites/search/index.feature_flags.ts b/x-pack/solutions/search/test/serverless/api_integration/configs/index.feature_flags.ts similarity index 75% rename from x-pack/test_serverless/api_integration/test_suites/search/index.feature_flags.ts rename to x-pack/solutions/search/test/serverless/api_integration/configs/index.feature_flags.ts index bbfbc47fe9184..0b27b0752404c 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/index.feature_flags.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/configs/index.feature_flags.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Serverless search API - feature flags', function () { - loadTestFile(require.resolve('./search_indices')); + loadTestFile(require.resolve('../test_suites/search_indices')); }); } diff --git a/x-pack/solutions/search/test/serverless/api_integration/configs/index.ts b/x-pack/solutions/search/test/serverless/api_integration/configs/index.ts new file mode 100644 index 0000000000000..7e13d7933d4e5 --- /dev/null +++ b/x-pack/solutions/search/test/serverless/api_integration/configs/index.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('Serverless search API', function () { + this.tags(['esGate']); + + loadTestFile(require.resolve('../test_suites/cases/find_cases')); + loadTestFile(require.resolve('../test_suites/cases/post_case')); + loadTestFile(require.resolve('../test_suites/serverless_search')); + loadTestFile(require.resolve('../test_suites/platform_security')); + loadTestFile(require.resolve('../test_suites/search_playground')); + }); +} diff --git a/x-pack/solutions/search/test/serverless/api_integration/ftr_provider_context.d.ts b/x-pack/solutions/search/test/serverless/api_integration/ftr_provider_context.d.ts new file mode 100644 index 0000000000000..aa56557c09df8 --- /dev/null +++ b/x-pack/solutions/search/test/serverless/api_integration/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 + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { GenericFtrProviderContext } from '@kbn/test'; + +import { services } from './services'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/solutions/search/test/serverless/api_integration/services/index.ts b/x-pack/solutions/search/test/serverless/api_integration/services/index.ts new file mode 100644 index 0000000000000..4829d091143ec --- /dev/null +++ b/x-pack/solutions/search/test/serverless/api_integration/services/index.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { GenericFtrProviderContext } from '@kbn/test'; +import { services as svlPlatformServices } from '@kbn/test-suites-xpack-platform/serverless/api_integration/services'; + +export const services = { + ...svlPlatformServices, + + // Search Solution serverless FTR services +}; + +export type InheritedFtrProviderContext = GenericFtrProviderContext; + +export type InheritedServices = InheritedFtrProviderContext extends GenericFtrProviderContext< + infer TServices, + {} +> + ? TServices + : {}; + +export type { + SupertestWithRoleScopeType, + RoleCredentials, +} from '@kbn/test-suites-xpack-platform/serverless/shared/services'; diff --git a/x-pack/test_serverless/api_integration/test_suites/search/cases/find_cases.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/cases/find_cases.ts similarity index 88% rename from x-pack/test_serverless/api_integration/test_suites/search/cases/find_cases.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/cases/find_cases.ts index c227f74b9117f..a3793baa93d7d 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/cases/find_cases.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/cases/find_cases.ts @@ -6,8 +6,8 @@ */ import { CASES_URL } from '@kbn/cases-plugin/common/constants'; -import type { RoleCredentials } from '../../../../shared/services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { RoleCredentials } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default ({ getService }: FtrProviderContext): void => { const supertestWithoutAuth = getService('supertestWithoutAuth'); diff --git a/x-pack/test_serverless/api_integration/test_suites/search/cases/post_case.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/cases/post_case.ts similarity index 92% rename from x-pack/test_serverless/api_integration/test_suites/search/cases/post_case.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/cases/post_case.ts index 4296d1207c385..9e4860cdd6c6f 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/cases/post_case.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/cases/post_case.ts @@ -8,9 +8,8 @@ import { CASES_URL } from '@kbn/cases-plugin/common/constants'; import { CaseSeverity } from '@kbn/cases-plugin/common/types/domain'; import { ConnectorTypes } from '@kbn/cases-plugin/common/types/domain'; -import type { RoleCredentials } from '../../../../shared/services'; - -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { RoleCredentials } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default ({ getService }: FtrProviderContext): void => { const supertestWithoutAuth = getService('supertestWithoutAuth'); diff --git a/x-pack/test_serverless/api_integration/test_suites/search/platform_security/authorization.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/platform_security/authorization.ts similarity index 99% rename from x-pack/test_serverless/api_integration/test_suites/search/platform_security/authorization.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/platform_security/authorization.ts index 1906b5ab2bed4..b22301baea3a0 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/platform_security/authorization.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/platform_security/authorization.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const svlCommonApi = getService('svlCommonApi'); diff --git a/x-pack/test_serverless/api_integration/test_suites/search/platform_security/index.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/platform_security/index.ts similarity index 86% rename from x-pack/test_serverless/api_integration/test_suites/search/platform_security/index.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/platform_security/index.ts index 5271f15b683f1..98cf495a677bf 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/platform_security/index.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/platform_security/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Platform security APIs', function () { diff --git a/x-pack/test_serverless/api_integration/test_suites/search/search_indices/index.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/index.ts similarity index 86% rename from x-pack/test_serverless/api_integration/test_suites/search/search_indices/index.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/index.ts index b48985faaecd5..3ac21874abcb0 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/search_indices/index.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('search indices APIs', function () { diff --git a/x-pack/test_serverless/api_integration/test_suites/search/search_indices/indices.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/indices.ts similarity index 95% rename from x-pack/test_serverless/api_integration/test_suites/search/search_indices/indices.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/indices.ts index 9519ce10fb622..7a3355992bcb5 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/search_indices/indices.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/indices.ts @@ -6,8 +6,8 @@ */ import expect from 'expect'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; const INTERNAL_API_BASE_PATH = '/internal/search_indices'; diff --git a/x-pack/test_serverless/api_integration/test_suites/search/search_indices/status.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/status.ts similarity index 95% rename from x-pack/test_serverless/api_integration/test_suites/search/search_indices/status.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/status.ts index 2fbde40cf09ab..a508a37377708 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/search_indices/status.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_indices/status.ts @@ -6,8 +6,8 @@ */ import expect from 'expect'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const roleScopedSupertest = getService('roleScopedSupertest'); diff --git a/x-pack/test_serverless/api_integration/test_suites/search/search_playground/index.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/index.ts similarity index 87% rename from x-pack/test_serverless/api_integration/test_suites/search/search_playground/index.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/index.ts index dde088814a213..1165657a59970 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/search_playground/index.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('search playground APIs', function () { diff --git a/x-pack/test_serverless/api_integration/test_suites/search/search_playground/playground_utility_apis.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/playground_utility_apis.ts similarity index 98% rename from x-pack/test_serverless/api_integration/test_suites/search/search_playground/playground_utility_apis.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/playground_utility_apis.ts index 2382ccfc553c4..92e04acbe7c37 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/search_playground/playground_utility_apis.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/playground_utility_apis.ts @@ -6,8 +6,8 @@ */ import expect from 'expect'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; const archivedBooksIndex = 'x-pack/solutions/search/test/functional_search/fixtures/search-books'; const archiveDenseVectorIndex = diff --git a/x-pack/test_serverless/api_integration/test_suites/search/search_playground/playgrounds.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/playgrounds.ts similarity index 99% rename from x-pack/test_serverless/api_integration/test_suites/search/search_playground/playgrounds.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/playgrounds.ts index 6411fb2846270..4352e4611a138 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/search_playground/playgrounds.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/search_playground/playgrounds.ts @@ -7,8 +7,8 @@ import expect from 'expect'; import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; const INTERNAL_API_BASE_PATH = '/internal/search_playground/playgrounds'; const INITIAL_REST_VERSION = '1' as const; diff --git a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/api_key.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/api_key.ts similarity index 96% rename from x-pack/test_serverless/api_integration/test_suites/search/serverless_search/api_key.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/api_key.ts index 99bc2d58d0317..4702633bc9a96 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/api_key.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/api_key.ts @@ -8,8 +8,8 @@ import expect from 'expect'; import { kibanaTestSuperuserServerless } from '@kbn/test'; import { SecurityApiKey } from '@elastic/elasticsearch/lib/api/types'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; const API_BASE_PATH = '/internal/serverless_search'; diff --git a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/connectors.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/connectors.ts similarity index 90% rename from x-pack/test_serverless/api_integration/test_suites/search/serverless_search/connectors.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/connectors.ts index 7e9e7634c968c..9d9b5110596a0 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/connectors.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/connectors.ts @@ -6,8 +6,8 @@ */ import expect from 'expect'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; const API_BASE_PATH = '/internal/serverless_search'; diff --git a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/index.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/index.ts similarity index 88% rename from x-pack/test_serverless/api_integration/test_suites/search/serverless_search/index.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/index.ts index dd80cb7f5342d..eb7addabedf0a 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/index.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Serverless Search - Server', function () { diff --git a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/indices.ts b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/indices.ts similarity index 92% rename from x-pack/test_serverless/api_integration/test_suites/search/serverless_search/indices.ts rename to x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/indices.ts index 9e98143ac4f3d..edadee275c09a 100644 --- a/x-pack/test_serverless/api_integration/test_suites/search/serverless_search/indices.ts +++ b/x-pack/solutions/search/test/serverless/api_integration/test_suites/serverless_search/indices.ts @@ -6,8 +6,8 @@ */ import expect from 'expect'; -import { SupertestWithRoleScopeType } from '../../../services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; const API_BASE_PATH = '/internal/serverless_search'; diff --git a/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts b/x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts similarity index 89% rename from x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts rename to x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts index 1b83a4d508da7..fbb82fc5b34f6 100644 --- a/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts +++ b/x-pack/solutions/search/test/serverless/functional/configs/config.feature_flags.ts @@ -5,7 +5,9 @@ * 2.0. */ -import { createTestConfig } from '../../config.base'; +import { createTestConfig } from '@kbn/test-suites-xpack-platform/serverless/functional/config.base'; +import { services } from '../services'; +import { pageObjects } from '../page_objects'; /** * Make sure to create a MKI deployment with custom Kibana image, that includes feature flags arguments @@ -13,6 +15,8 @@ import { createTestConfig } from '../../config.base'; */ export default createTestConfig({ serverlessProject: 'es', + pageObjects, + services, junit: { reportName: 'Serverless Search Feature Flags Functional Tests', }, diff --git a/x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts b/x-pack/solutions/search/test/serverless/functional/configs/config.screenshots.ts similarity index 71% rename from x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts rename to x-pack/solutions/search/test/serverless/functional/configs/config.screenshots.ts index f146583710057..6e9cb5aab9b55 100644 --- a/x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts +++ b/x-pack/solutions/search/test/serverless/functional/configs/config.screenshots.ts @@ -5,13 +5,17 @@ * 2.0. */ -import { createTestConfig } from '../../config.base'; +import { createTestConfig } from '@kbn/test-suites-xpack-platform/serverless/functional/config.base'; +import { services } from '../services'; +import { pageObjects } from '../page_objects'; const enabledActionTypes = ['.index']; export default createTestConfig({ serverlessProject: 'es', - testFiles: [require.resolve('./screenshot_creation')], + pageObjects, + services, + testFiles: [require.resolve('../test_suites/screenshot_creation')], kbnServerArgs: [`--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`], junit: { reportName: 'Serverless Search Screenshot Creation', diff --git a/x-pack/test_serverless/functional/test_suites/search/config.ts b/x-pack/solutions/search/test/serverless/functional/configs/config.ts similarity index 90% rename from x-pack/test_serverless/functional/test_suites/search/config.ts rename to x-pack/solutions/search/test/serverless/functional/configs/config.ts index 54b6dc9259ee5..091ef9fee46d2 100644 --- a/x-pack/test_serverless/functional/test_suites/search/config.ts +++ b/x-pack/solutions/search/test/serverless/functional/configs/config.ts @@ -5,10 +5,14 @@ * 2.0. */ import { KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; -import { createTestConfig } from '../../config.base'; +import { createTestConfig } from '@kbn/test-suites-xpack-platform/serverless/functional/config.base'; +import { services } from '../services'; +import { pageObjects } from '../page_objects'; export default createTestConfig({ serverlessProject: 'es', + pageObjects, + services, testFiles: [require.resolve('.')], junit: { reportName: 'Serverless Search Functional Tests', diff --git a/x-pack/test_serverless/functional/test_suites/search/index.feature_flags.ts b/x-pack/solutions/search/test/serverless/functional/configs/index.feature_flags.ts similarity index 52% rename from x-pack/test_serverless/functional/test_suites/search/index.feature_flags.ts rename to x-pack/solutions/search/test/serverless/functional/configs/index.feature_flags.ts index 40fd0debb74d5..ab1f57cf7efb2 100644 --- a/x-pack/test_serverless/functional/test_suites/search/index.feature_flags.ts +++ b/x-pack/solutions/search/test/serverless/functional/configs/index.feature_flags.ts @@ -5,14 +5,14 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('serverless search UI - feature flags', function () { // add tests that require feature flags, defined in config.feature_flags.ts - loadTestFile(require.resolve('./search_synonyms/search_synonyms_overview')); - loadTestFile(require.resolve('./search_synonyms/search_synonym_detail')); - loadTestFile(require.resolve('./search_playground/search_relevance')); - loadTestFile(require.resolve('./search_playground/saved_playgrounds')); + loadTestFile(require.resolve('../test_suites/search_synonyms/search_synonyms_overview')); + loadTestFile(require.resolve('../test_suites/search_synonyms/search_synonym_detail')); + loadTestFile(require.resolve('../test_suites/search_playground/search_relevance')); + loadTestFile(require.resolve('../test_suites/search_playground/saved_playgrounds')); }); } diff --git a/x-pack/solutions/search/test/serverless/functional/configs/index.ts b/x-pack/solutions/search/test/serverless/functional/configs/index.ts new file mode 100644 index 0000000000000..e25fe3021a7c8 --- /dev/null +++ b/x-pack/solutions/search/test/serverless/functional/configs/index.ts @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('serverless search UI', function () { + this.tags(['esGate']); + + loadTestFile(require.resolve('../test_suites/navigation')); + loadTestFile(require.resolve('../test_suites/elasticsearch_start.ts')); + loadTestFile(require.resolve('../test_suites/search_homepage')); + loadTestFile(require.resolve('../test_suites/search_index_detail.ts')); + loadTestFile(require.resolve('../test_suites/getting_started')); + loadTestFile(require.resolve('../test_suites/index_management')); + loadTestFile(require.resolve('../test_suites/connectors/connectors_overview')); + loadTestFile(require.resolve('../test_suites/default_dataview')); + loadTestFile(require.resolve('../test_suites/pipelines')); + loadTestFile(require.resolve('../test_suites/cases/attachment_framework')); + loadTestFile(require.resolve('../test_suites/dashboards/build_dashboard')); + loadTestFile(require.resolve('../test_suites/dashboards/import_dashboard')); + loadTestFile(require.resolve('../test_suites/advanced_settings')); + loadTestFile(require.resolve('../test_suites/rules/rule_details')); + loadTestFile(require.resolve('../test_suites/console_notebooks')); + loadTestFile(require.resolve('../test_suites/search_playground/playground_overview')); + loadTestFile(require.resolve('../test_suites/ml')); + loadTestFile(require.resolve('../test_suites/custom_role_access')); + loadTestFile(require.resolve('../test_suites/inference_management')); + loadTestFile(require.resolve('../test_suites/search_query_rules/search_query_rules_overview')); + loadTestFile(require.resolve('../test_suites/search_synonyms/search_synonyms_overview')); + loadTestFile(require.resolve('../test_suites/search_synonyms/search_synonym_detail')); + }); +} diff --git a/x-pack/test_serverless/functional/test_suites/search/fixtures/playground_books/data.json.gz b/x-pack/solutions/search/test/serverless/functional/fixtures/playground_books/data.json.gz similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/fixtures/playground_books/data.json.gz rename to x-pack/solutions/search/test/serverless/functional/fixtures/playground_books/data.json.gz diff --git a/x-pack/test_serverless/functional/test_suites/search/fixtures/playground_books/mappings.json b/x-pack/solutions/search/test/serverless/functional/fixtures/playground_books/mappings.json similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/fixtures/playground_books/mappings.json rename to x-pack/solutions/search/test/serverless/functional/fixtures/playground_books/mappings.json diff --git a/x-pack/solutions/search/test/serverless/functional/ftr_provider_context.d.ts b/x-pack/solutions/search/test/serverless/functional/ftr_provider_context.d.ts new file mode 100644 index 0000000000000..6092c6668a3dc --- /dev/null +++ b/x-pack/solutions/search/test/serverless/functional/ftr_provider_context.d.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 + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { GenericFtrProviderContext } from '@kbn/test'; + +import { services } from './services'; +import { pageObjects } from './page_objects'; + +export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/solutions/search/test/serverless/functional/page_objects/index.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/index.ts new file mode 100644 index 0000000000000..0fa6a36397026 --- /dev/null +++ b/x-pack/solutions/search/test/serverless/functional/page_objects/index.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { pageObjects as svlPlatformPageObjects } from '@kbn/test-suites-xpack-platform/serverless/functional/page_objects'; +import { SvlSearchLandingPageProvider } from './svl_search_landing_page'; +import { SvlSearchConnectorsPageProvider } from './svl_search_connectors_page'; +import { SvlSearchHomePageProvider } from './svl_search_homepage'; +import { SvlSearchIndexDetailPageProvider } from './svl_search_index_detail_page'; +import { SvlSearchElasticsearchStartPageProvider } from './svl_search_elasticsearch_start_page'; +import { SvlSearchCreateIndexPageProvider } from './svl_search_create_index_page'; +import { SvlSearchInferenceManagementPageProvider } from './svl_search_inference_management_page'; +import { SearchPlaygroundPageProvider } from '../../../functional_search/page_objects/search_playground_page'; +import { SearchQueryRulesPageProvider } from '../../../functional_search/page_objects/search_query_rules_page'; +import { SearchSynonymsPageProvider } from '../../../functional_search/page_objects/search_synonyms_page'; + +export const pageObjects = { + ...svlPlatformPageObjects, + // Search Solution serverless FTR page objects + svlSearchConnectorsPage: SvlSearchConnectorsPageProvider, + svlSearchLandingPage: SvlSearchLandingPageProvider, + svlSearchHomePage: SvlSearchHomePageProvider, + svlSearchIndexDetailPage: SvlSearchIndexDetailPageProvider, + svlSearchElasticsearchStartPage: SvlSearchElasticsearchStartPageProvider, + svlSearchCreateIndexPage: SvlSearchCreateIndexPageProvider, + svlSearchInferenceManagementPage: SvlSearchInferenceManagementPageProvider, + searchPlayground: SearchPlaygroundPageProvider, + searchQueryRules: SearchQueryRulesPageProvider, + searchSynonyms: SearchSynonymsPageProvider, +}; diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_connectors_page.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_connectors_page.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_connectors_page.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_connectors_page.ts diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_create_index_page.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_create_index_page.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_create_index_page.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_create_index_page.ts diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_elasticsearch_start_page.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_elasticsearch_start_page.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_elasticsearch_start_page.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_elasticsearch_start_page.ts diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_homepage.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_homepage.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_homepage.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_homepage.ts diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_index_detail_page.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_index_detail_page.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_index_detail_page.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_index_detail_page.ts diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_inference_management_page.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_inference_management_page.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_inference_management_page.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_inference_management_page.ts diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_landing_page.ts b/x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_landing_page.ts similarity index 100% rename from x-pack/test_serverless/functional/page_objects/svl_search_landing_page.ts rename to x-pack/solutions/search/test/serverless/functional/page_objects/svl_search_landing_page.ts diff --git a/x-pack/solutions/search/test/serverless/functional/services/index.ts b/x-pack/solutions/search/test/serverless/functional/services/index.ts new file mode 100644 index 0000000000000..bf607f693b34f --- /dev/null +++ b/x-pack/solutions/search/test/serverless/functional/services/index.ts @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { services as svlPlatformServices } from '@kbn/test-suites-xpack-platform/serverless/functional/services'; +import { services as platformServices } from '@kbn/test-suites-xpack-platform/functional/services'; +import { SvlSearchNavigationServiceProvider } from './svl_search_navigation'; + +export const services = { + ...svlPlatformServices, + // Search Solution serverless FTR services + svlSearchNavigation: SvlSearchNavigationServiceProvider, + ml: platformServices.ml, +}; + +export type { + SupertestWithRoleScopeType, + RoleCredentials, +} from '@kbn/test-suites-xpack-platform/serverless/shared/services'; diff --git a/x-pack/test_serverless/functional/services/svl_search_navigation.ts b/x-pack/solutions/search/test/serverless/functional/services/svl_search_navigation.ts similarity index 100% rename from x-pack/test_serverless/functional/services/svl_search_navigation.ts rename to x-pack/solutions/search/test/serverless/functional/services/svl_search_navigation.ts diff --git a/x-pack/test_serverless/functional/test_suites/search/advanced_settings.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/advanced_settings.ts similarity index 96% rename from x-pack/test_serverless/functional/test_suites/search/advanced_settings.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/advanced_settings.ts index 850832825fba6..a386c72eab7fc 100644 --- a/x-pack/test_serverless/functional/test_suites/search/advanced_settings.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/advanced_settings.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import { SEARCH_PROJECT_SETTINGS } from '@kbn/serverless-search-settings'; import { isEditorFieldSetting } from '@kbn/test-suites-xpack-platform/serverless/functional/test_suites/management/advanced_settings'; -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; export default ({ getPageObjects, getService }: FtrProviderContext) => { const testSubjects = getService('testSubjects'); diff --git a/x-pack/test_serverless/functional/test_suites/search/cases/attachment_framework.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/cases/attachment_framework.ts similarity index 96% rename from x-pack/test_serverless/functional/test_suites/search/cases/attachment_framework.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/cases/attachment_framework.ts index 85daaecffc00e..af56c4d1d9c57 100644 --- a/x-pack/test_serverless/functional/test_suites/search/cases/attachment_framework.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/cases/attachment_framework.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default ({ getPageObject, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); diff --git a/x-pack/test_serverless/functional/test_suites/search/connectors/connectors_overview.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/connectors/connectors_overview.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/connectors/connectors_overview.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/connectors/connectors_overview.ts index 6bb35aec930f8..c9fee57e7c9f6 100644 --- a/x-pack/test_serverless/functional/test_suites/search/connectors/connectors_overview.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/connectors/connectors_overview.ts @@ -5,7 +5,7 @@ * 2.0. */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { testHasEmbeddedConsole } from '../embedded_console'; const TEST_CONNECTOR_NAME = 'my-connector'; diff --git a/x-pack/test_serverless/functional/test_suites/search/console_notebooks.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/console_notebooks.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/console_notebooks.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/console_notebooks.ts index 8d1377bce93a3..75c2e4eb10798 100644 --- a/x-pack/test_serverless/functional/test_suites/search/console_notebooks.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/console_notebooks.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects(['svlCommonPage', 'embeddedConsole']); diff --git a/x-pack/test_serverless/functional/test_suites/search/custom_role_access.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/custom_role_access.ts similarity index 96% rename from x-pack/test_serverless/functional/test_suites/search/custom_role_access.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/custom_role_access.ts index aba3ce8f69da7..0a6d61cc442a3 100644 --- a/x-pack/test_serverless/functional/test_suites/search/custom_role_access.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/custom_role_access.ts @@ -6,8 +6,8 @@ */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../ftr_provider_context'; -import { RoleCredentials } from '../../../shared/services'; +import { FtrProviderContext } from '../ftr_provider_context'; +import { RoleCredentials } from '../services'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects(['svlCommonPage', 'timePicker', 'common', 'header']); diff --git a/x-pack/test_serverless/functional/test_suites/search/dashboards/build_dashboard.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/build_dashboard.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/dashboards/build_dashboard.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/build_dashboard.ts index 8983b779ded2e..f723212d22602 100644 --- a/x-pack/test_serverless/functional/test_suites/search/dashboards/build_dashboard.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/build_dashboard.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const PageObjects = getPageObjects([ diff --git a/x-pack/test_serverless/functional/test_suites/search/dashboards/exports/serverless_dashboard_8_11.ndjson b/x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/exports/serverless_dashboard_8_11.ndjson similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/dashboards/exports/serverless_dashboard_8_11.ndjson rename to x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/exports/serverless_dashboard_8_11.ndjson diff --git a/x-pack/test_serverless/functional/test_suites/search/dashboards/import_dashboard.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/import_dashboard.ts similarity index 97% rename from x-pack/test_serverless/functional/test_suites/search/dashboards/import_dashboard.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/import_dashboard.ts index 3d966b4d5a2d5..d903ffb734bee 100644 --- a/x-pack/test_serverless/functional/test_suites/search/dashboards/import_dashboard.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/dashboards/import_dashboard.ts @@ -11,7 +11,7 @@ import expect from '@kbn/expect'; import path from 'path'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const esArchiver = getService('esArchiver'); diff --git a/x-pack/test_serverless/functional/test_suites/search/default_dataview.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/default_dataview.ts similarity index 87% rename from x-pack/test_serverless/functional/test_suites/search/default_dataview.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/default_dataview.ts index e772c814389a5..2cdfbeba328e5 100644 --- a/x-pack/test_serverless/functional/test_suites/search/default_dataview.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/default_dataview.ts @@ -5,7 +5,8 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; +import { RoleCredentials } from '../services'; export default function ({ getPageObject, getService }: FtrProviderContext) { const svlSearchNavigation = getService('svlSearchNavigation'); @@ -13,14 +14,18 @@ export default function ({ getPageObject, getService }: FtrProviderContext) { const svlCommonNavigation = getPageObject('svlCommonNavigation'); const svlCommonPage = getPageObject('svlCommonPage'); const dataViewApi = getService('dataViewApi'); + const samlAuth = getService('samlAuth'); + let roleAuthc: RoleCredentials; describe('default dataView', function () { before(async () => { await svlCommonPage.loginWithRole('developer'); await svlSearchNavigation.navigateToLandingPage(); + roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin'); // re-create the default data view in case it has been cleaned up by another test await dataViewApi.create({ + roleAuthc, id: 'default_all_data_id', name: 'default:all-data', title: '*,-.*', diff --git a/x-pack/test_serverless/functional/test_suites/search/elasticsearch_start.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/elasticsearch_start.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/elasticsearch_start.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/elasticsearch_start.ts index 8441fe38342c5..0a053f8f285e3 100644 --- a/x-pack/test_serverless/functional/test_suites/search/elasticsearch_start.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/elasticsearch_start.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; import { testHasEmbeddedConsole } from './embedded_console'; diff --git a/x-pack/test_serverless/functional/test_suites/search/embedded_console.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/embedded_console.ts similarity index 93% rename from x-pack/test_serverless/functional/test_suites/search/embedded_console.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/embedded_console.ts index cbb61aa31ad4c..04153d4a39ee6 100644 --- a/x-pack/test_serverless/functional/test_suites/search/embedded_console.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/embedded_console.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; type PageObjects = Pick, 'embeddedConsole'>; diff --git a/x-pack/test_serverless/functional/test_suites/search/getting_started.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/getting_started.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/getting_started.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/getting_started.ts index 4a2c34d98eebc..4b4a396c58078 100644 --- a/x-pack/test_serverless/functional/test_suites/search/getting_started.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/getting_started.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; import { testHasEmbeddedConsole } from './embedded_console'; diff --git a/x-pack/test_serverless/functional/test_suites/search/index_management.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/index_management.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/index_management.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/index_management.ts index 459738cba7831..d14fd5f99dfeb 100644 --- a/x-pack/test_serverless/functional/test_suites/search/index_management.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/index_management.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; import { testHasEmbeddedConsole } from './embedded_console'; diff --git a/x-pack/test_serverless/functional/test_suites/search/inference_management.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/inference_management.ts similarity index 97% rename from x-pack/test_serverless/functional/test_suites/search/inference_management.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/inference_management.ts index f3a0ef0e041c7..d40c21c5d0701 100644 --- a/x-pack/test_serverless/functional/test_suites/search/inference_management.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/inference_management.ts @@ -6,7 +6,7 @@ */ import { testHasEmbeddedConsole } from './embedded_console'; -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects([ diff --git a/x-pack/test_serverless/functional/test_suites/search/ml/index.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/ml/index.ts similarity index 87% rename from x-pack/test_serverless/functional/test_suites/search/ml/index.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/ml/index.ts index 1f3a48f89d7d6..0a66d435041c9 100644 --- a/x-pack/test_serverless/functional/test_suites/search/ml/index.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/ml/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Search ML', function () { diff --git a/x-pack/test_serverless/functional/test_suites/search/ml/search_bar_features.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/ml/search_bar_features.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/ml/search_bar_features.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/ml/search_bar_features.ts index ff1d46cf6f302..9be78cf1b1db9 100644 --- a/x-pack/test_serverless/functional/test_suites/search/ml/search_bar_features.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/ml/search_bar_features.ts @@ -5,7 +5,7 @@ * 2.0. */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['header', 'svlCommonPage', 'svlCommonNavigation']); diff --git a/x-pack/test_serverless/functional/test_suites/search/ml/trained_models_list.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/ml/trained_models_list.ts similarity index 97% rename from x-pack/test_serverless/functional/test_suites/search/ml/trained_models_list.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/ml/trained_models_list.ts index 418c68305d95d..d07c744c9ee17 100644 --- a/x-pack/test_serverless/functional/test_suites/search/ml/trained_models_list.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/ml/trained_models_list.ts @@ -5,7 +5,7 @@ * 2.0. */ import { SUPPORTED_TRAINED_MODELS } from '@kbn/test-suites-xpack-platform/functional/services/ml/api'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects, getPageObject }: FtrProviderContext) { const ml = getService('ml'); diff --git a/x-pack/test_serverless/functional/test_suites/search/navigation.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/navigation.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/navigation.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/navigation.ts index b651f7f159819..882f7404112f2 100644 --- a/x-pack/test_serverless/functional/test_suites/search/navigation.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/navigation.ts @@ -7,7 +7,7 @@ import type { AppDeepLinkId } from '@kbn/core-chrome-browser'; import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; const archiveEmptyIndex = 'x-pack/solutions/search/test/functional_search/fixtures/search-empty-index'; diff --git a/x-pack/test_serverless/functional/test_suites/search/pipelines.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/pipelines.ts similarity index 94% rename from x-pack/test_serverless/functional/test_suites/search/pipelines.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/pipelines.ts index 8f90a32c747a4..55bf8b1fb6656 100644 --- a/x-pack/test_serverless/functional/test_suites/search/pipelines.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/pipelines.ts @@ -4,7 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; import { testHasEmbeddedConsole } from './embedded_console'; export default function ({ getPageObjects }: FtrProviderContext) { diff --git a/x-pack/test_serverless/functional/test_suites/search/rules/rule_details.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/rules/rule_details.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/rules/rule_details.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/rules/rule_details.ts index 5016c6f2efd59..e4220a3ebde02 100644 --- a/x-pack/test_serverless/functional/test_suites/search/rules/rule_details.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/rules/rule_details.ts @@ -7,8 +7,8 @@ import { expect } from 'expect'; import { v4 as uuidv4 } from 'uuid'; -import { RoleCredentials } from '../../../../shared/services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { RoleCredentials } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; export enum RuleNotifyWhen { CHANGE = 'onActionGroupChange', diff --git a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/index.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/index.ts similarity index 86% rename from x-pack/test_serverless/functional/test_suites/search/screenshot_creation/index.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/index.ts index 90e905735c307..2d5d0cfd67c2d 100644 --- a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/index.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Screenshots - serverless search UI', function () { diff --git a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/index.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/index.ts similarity index 95% rename from x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/index.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/index.ts index 3df3eaa1939b4..7d108a1a0ceaf 100644 --- a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/index.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../../ftr_provider_context'; +import { FtrProviderContext } from '../../../ftr_provider_context'; export const ECOMMERCE_INDEX_PATTERN = 'kibana_sample_data_ecommerce'; export const FLIGHTS_INDEX_PATTERN = 'kibana_sample_data_flights'; diff --git a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/stack_connectors/connectors.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/stack_connectors/connectors.ts similarity index 96% rename from x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/stack_connectors/connectors.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/stack_connectors/connectors.ts index 62a79f5e5dcd6..cfdefbe0ca5c8 100644 --- a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/stack_connectors/connectors.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/stack_connectors/connectors.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../../../ftr_provider_context'; +import { FtrProviderContext } from '../../../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const svlCommonScreenshots = getService('svlCommonScreenshots'); diff --git a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/stack_connectors/index.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/stack_connectors/index.ts similarity index 95% rename from x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/stack_connectors/index.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/stack_connectors/index.ts index 701716433056d..2245d2c726c36 100644 --- a/x-pack/test_serverless/functional/test_suites/search/screenshot_creation/response_ops_docs/stack_connectors/index.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/stack_connectors/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../../../../../ftr_provider_context'; +import { FtrProviderContext } from '../../../../ftr_provider_context'; export default function ({ loadTestFile, getService }: FtrProviderContext) { const actions = getService('actions'); diff --git a/x-pack/test_serverless/functional/test_suites/search/search_homepage.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_homepage.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/search_homepage.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_homepage.ts index 8917d35b84191..9c00f74824281 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_homepage.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_homepage.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; -import { RoleCredentials } from '../../../shared/services'; +import { FtrProviderContext } from '../ftr_provider_context'; +import { RoleCredentials } from '../services'; import { testHasEmbeddedConsole } from './embedded_console'; export default function ({ getPageObjects, getService }: FtrProviderContext) { diff --git a/x-pack/test_serverless/functional/test_suites/search/search_index_detail.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_index_detail.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/search_index_detail.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_index_detail.ts index 6c4f07d9f75de..5f3d85f8ba808 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_index_detail.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_index_detail.ts @@ -4,7 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { FtrProviderContext } from '../../ftr_provider_context'; +import { FtrProviderContext } from '../ftr_provider_context'; import { testHasEmbeddedConsole } from './embedded_console'; export default function ({ getPageObjects, getService }: FtrProviderContext) { diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/playground_overview.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/playground_overview.ts index 2a776cc80e6ff..be78afe65fa5d 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/playground_overview.ts @@ -7,8 +7,8 @@ import type OpenAI from 'openai'; import { testHasEmbeddedConsole } from '../embedded_console'; -import { FtrProviderContext } from '../../../ftr_provider_context'; -import { RoleCredentials } from '../../../../shared/services'; +import { FtrProviderContext } from '../../ftr_provider_context'; +import { RoleCredentials } from '../../services'; import { createOpenAIConnector } from './utils/create_openai_connector'; import { createLlmProxy, LlmProxy } from './utils/create_llm_proxy'; diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/saved_playgrounds.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/saved_playgrounds.ts similarity index 96% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/saved_playgrounds.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/saved_playgrounds.ts index 2b109181703ce..734352d3884e9 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_playground/saved_playgrounds.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/saved_playgrounds.ts @@ -6,8 +6,8 @@ */ import expect from '@kbn/expect'; -import type { SupertestWithRoleScopeType } from '@kbn/test-suites-xpack-platform/api_integration_deployment_agnostic/services'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import type { SupertestWithRoleScopeType } from '../../services'; +import { FtrProviderContext } from '../../ftr_provider_context'; import { createPlayground, deletePlayground } from './utils/create_playground'; diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/search_relevance.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/search_relevance.ts similarity index 96% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/search_relevance.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/search_relevance.ts index df79fd1257284..4958353d42830 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_playground/search_relevance.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/search_relevance.ts @@ -5,11 +5,11 @@ * 2.0. */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; const ARCHIVE_INDEX_NAME = 'search-playground-books'; const esArchiveIndex = - 'x-pack/test_serverless/functional/test_suites/search/fixtures/playground_books'; + 'x-pack/solutions/search/test/serverless/functional/fixtures/playground_books'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects([ diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_llm_proxy.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_llm_proxy.ts similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_llm_proxy.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_llm_proxy.ts diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_openai_chunk.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_openai_chunk.ts similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_openai_chunk.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_openai_chunk.ts diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_openai_connector.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_openai_connector.ts similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_openai_connector.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_openai_connector.ts diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_playground.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_playground.ts similarity index 100% rename from x-pack/test_serverless/functional/test_suites/search/search_playground/utils/create_playground.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_playground/utils/create_playground.ts diff --git a/x-pack/test_serverless/functional/test_suites/search/search_query_rules/search_query_rules_overview.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_query_rules/search_query_rules_overview.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/search_query_rules/search_query_rules_overview.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_query_rules/search_query_rules_overview.ts index 01ecd25db033d..90209deaf68d7 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_query_rules/search_query_rules_overview.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_query_rules/search_query_rules_overview.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects([ diff --git a/x-pack/test_serverless/functional/test_suites/search/search_synonyms/search_synonym_detail.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_synonyms/search_synonym_detail.ts similarity index 98% rename from x-pack/test_serverless/functional/test_suites/search/search_synonyms/search_synonym_detail.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_synonyms/search_synonym_detail.ts index 3f7b3559649c0..904b7fe74bb1e 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_synonyms/search_synonym_detail.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_synonyms/search_synonym_detail.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects([ diff --git a/x-pack/test_serverless/functional/test_suites/search/search_synonyms/search_synonyms_overview.ts b/x-pack/solutions/search/test/serverless/functional/test_suites/search_synonyms/search_synonyms_overview.ts similarity index 99% rename from x-pack/test_serverless/functional/test_suites/search/search_synonyms/search_synonyms_overview.ts rename to x-pack/solutions/search/test/serverless/functional/test_suites/search_synonyms/search_synonyms_overview.ts index 42bbe2ef569f6..d7c4c85f64924 100644 --- a/x-pack/test_serverless/functional/test_suites/search/search_synonyms/search_synonyms_overview.ts +++ b/x-pack/solutions/search/test/serverless/functional/test_suites/search_synonyms/search_synonyms_overview.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { SynonymsGetSynonymResponse } from '@elastic/elasticsearch/lib/api/types'; -import { FtrProviderContext } from '../../../ftr_provider_context'; +import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const pageObjects = getPageObjects([ diff --git a/x-pack/solutions/search/test/tsconfig.json b/x-pack/solutions/search/test/tsconfig.json index 8b4590279fc03..4ed7d1657e03b 100644 --- a/x-pack/solutions/search/test/tsconfig.json +++ b/x-pack/solutions/search/test/tsconfig.json @@ -28,11 +28,13 @@ "@kbn/guided-onboarding", "@kbn/search-playground", "@kbn/tooling-log", - "@kbn/test-suites-xpack", "@kbn/ftr-common-functional-ui-services", "@kbn/core-chrome-browser", "@kbn/observability-ai-assistant-plugin", "@kbn/inference-common", "@kbn/test-suites-src", + "@kbn/dev-utils", + "@kbn/cases-plugin", + "@kbn/serverless-search-settings", ] } diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts index e2d7266bc131c..512fb7f5157fd 100644 --- a/x-pack/test/functional/page_objects/index.ts +++ b/x-pack/test/functional/page_objects/index.ts @@ -45,10 +45,6 @@ import { InfraHostsViewProvider } from './infra_hosts_view'; import { InfraLogsPageProvider } from './infra_logs_page'; import { ObservabilityLogsExplorerPageObject } from './observability_logs_explorer'; import { DatasetQualityPageObject } from './dataset_quality'; -import { SearchPlaygroundPageProvider } from './search_playground_page'; -import { SearchSynonymsPageProvider } from './search_synonyms_page'; -import { SearchQueryRulesPageProvider } from './search_query_rules_page'; -import { SearchStartProvider } from './search_start'; // just like services, PageObjects are defined as a map of // names to Providers. Merge in Kibana's or pick specific ones @@ -83,11 +79,7 @@ export const pageObjects = { reporting: ReportingPageObject, roleMappings: RoleMappingsPageProvider, rollup: RollupPageObject, - searchStart: SearchStartProvider, searchProfiler: SearchProfilerPageProvider, - searchPlayground: SearchPlaygroundPageProvider, - searchSynonyms: SearchSynonymsPageProvider, - searchQueryRules: SearchQueryRulesPageProvider, searchSessionsManagement: SearchSessionsPageProvider, security: SecurityPageObject, snapshotRestore: SnapshotRestorePageProvider, diff --git a/x-pack/test/functional/page_objects/search_start.ts b/x-pack/test/functional/page_objects/search_start.ts deleted file mode 100644 index c833df7d42272..0000000000000 --- a/x-pack/test/functional/page_objects/search_start.ts +++ /dev/null @@ -1,144 +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 - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import expect from '@kbn/expect'; -import { FtrProviderContext } from '../ftr_provider_context'; - -export function SearchStartProvider({ getService }: FtrProviderContext) { - const testSubjects = getService('testSubjects'); - const browser = getService('browser'); - const retry = getService('retry'); - - return { - async expectToBeOnStartPage() { - await testSubjects.existOrFail('elasticsearchStartPage', { timeout: 2000 }); - }, - async expectToBeOnCreateIndexPage() { - expect(await browser.getCurrentUrl()).contain('/app/elasticsearch/indices/create'); - await testSubjects.existOrFail('elasticsearchCreateIndexPage', { timeout: 2000 }); - }, - async expectToBeOnIndexDetailsPage() { - await retry.tryForTime(60 * 1000, async () => { - expect(await browser.getCurrentUrl()).contain('/app/elasticsearch/indices/index_details'); - }); - }, - async expectToBeOnIndexListPage() { - await retry.tryForTime(60 * 1000, async () => { - expect(await browser.getCurrentUrl()).contain( - '/app/elasticsearch/index_management/indices' - ); - }); - }, - async expectToBeOnSearchHomepagePage() { - await retry.tryForTime(60 * 1000, async () => { - expect(await browser.getCurrentUrl()).contain('/app/elasticsearch/home'); - }); - }, - async expectToBeOnMLFileUploadPage() { - await retry.tryForTime(60 * 1000, async () => { - expect(await browser.getCurrentUrl()).contain('/app/ml/filedatavisualizer'); - }); - }, - async expectIndexNameToExist() { - await testSubjects.existOrFail('indexNameField'); - }, - async setIndexNameValue(value: string) { - await testSubjects.existOrFail('indexNameField'); - await testSubjects.setValue('indexNameField', value); - }, - async expectCloseCreateIndexButtonExists() { - await testSubjects.existOrFail('closeCreateIndex'); - }, - async clickCloseCreateIndexButton() { - await testSubjects.existOrFail('closeCreateIndex'); - await testSubjects.click('closeCreateIndex'); - }, - async expectSkipButtonExists() { - await testSubjects.existOrFail('createIndexSkipBtn'); - }, - async clickSkipButton() { - await testSubjects.existOrFail('createIndexSkipBtn'); - const element = await testSubjects.find('createIndexSkipBtn'); - await element.scrollIntoView(); - await testSubjects.click('createIndexSkipBtn'); - }, - async expectCreateIndexButtonToExist() { - await testSubjects.existOrFail('createIndexBtn'); - }, - async expectCreateIndexButtonToBeEnabled() { - await testSubjects.existOrFail('createIndexBtn'); - expect(await testSubjects.isEnabled('createIndexBtn')).equal(true); - }, - async expectCreateIndexButtonToBeDisabled() { - await testSubjects.existOrFail('createIndexBtn'); - expect(await testSubjects.isEnabled('createIndexBtn')).equal(false); - }, - async clickCreateIndexButton() { - await testSubjects.existOrFail('createIndexBtn'); - expect(await testSubjects.isEnabled('createIndexBtn')).equal(true); - await testSubjects.click('createIndexBtn'); - }, - async expectCreateIndexCodeView() { - await testSubjects.existOrFail('createIndexCodeView'); - }, - async expectCreateIndexUIView() { - await testSubjects.existOrFail('createIndexUIView'); - }, - async clickUIViewButton() { - await testSubjects.existOrFail('createIndexUIViewBtn'); - await testSubjects.click('createIndexUIViewBtn'); - }, - async clickCodeViewButton() { - await testSubjects.existOrFail('createIndexCodeViewBtn'); - await testSubjects.click('createIndexCodeViewBtn'); - }, - async clickFileUploadLink() { - await testSubjects.existOrFail('uploadFileLink'); - await testSubjects.click('uploadFileLink'); - }, - - async expectAPIKeyVisibleInCodeBlock(apiKey: string) { - await testSubjects.existOrFail('createIndex-code-block'); - await retry.try(async () => { - expect(await testSubjects.getVisibleText('createIndex-code-block')).to.contain(apiKey); - }); - }, - - async expectAPIKeyPreGenerated() { - await testSubjects.existOrFail('apiKeyHasBeenGenerated'); - }, - - async expectAPIKeyNotPreGenerated() { - await testSubjects.existOrFail('apiKeyHasNotBeenGenerated'); - }, - - async expectAPIKeyFormNotAvailable() { - await testSubjects.missingOrFail('apiKeyHasNotBeenGenerated'); - await testSubjects.missingOrFail('apiKeyHasBeenGenerated'); - }, - async expectAnalyzeLogsIntegrationLink() { - await testSubjects.existOrFail('analyzeLogsBrowseIntegrations'); - expect(await testSubjects.getAttribute('analyzeLogsBrowseIntegrations', 'href')).match( - /^https?\:\/\/.*\/app\/integrations\/browse\/observability/ - ); - - expect(await testSubjects.getAttribute('analyzeLogsBrowseIntegrations', 'target')).equal( - '_blank' - ); - }, - async expectCreateO11ySpaceBtn() { - await testSubjects.existOrFail('createO11ySpaceBtn'); - expect(await testSubjects.getAttribute('createO11ySpaceBtn', 'href')).match( - /^https?\:\/\/.*\/app\/management\/kibana\/spaces\/create/ - ); - expect(await testSubjects.getAttribute('createO11ySpaceBtn', 'target')).equal('_blank'); - }, - async clearSkipEmptyStateStorageFlag() { - await browser.removeLocalStorageItem('search_onboarding_global_empty_state_skip'); - }, - }; -} diff --git a/x-pack/test_serverless/api_integration/test_suites/search/index.ts b/x-pack/test_serverless/api_integration/test_suites/search/index.ts deleted file mode 100644 index 27094c9fb9eb0..0000000000000 --- a/x-pack/test_serverless/api_integration/test_suites/search/index.ts +++ /dev/null @@ -1,20 +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 - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FtrProviderContext } from '../../ftr_provider_context'; - -export default function ({ loadTestFile }: FtrProviderContext) { - describe('Serverless search API', function () { - this.tags(['esGate']); - - loadTestFile(require.resolve('./cases/find_cases')); - loadTestFile(require.resolve('./cases/post_case')); - loadTestFile(require.resolve('./serverless_search')); - loadTestFile(require.resolve('./platform_security')); - loadTestFile(require.resolve('./search_playground')); - }); -} diff --git a/x-pack/test_serverless/functional/page_objects/index.ts b/x-pack/test_serverless/functional/page_objects/index.ts index 1154e788b51f2..283a446c17159 100644 --- a/x-pack/test_serverless/functional/page_objects/index.ts +++ b/x-pack/test_serverless/functional/page_objects/index.ts @@ -18,14 +18,7 @@ import { SvlTriggersActionsPageProvider } from '@kbn/test-suites-xpack-platform/ import { SvlObltOnboardingPageProvider } from './svl_oblt_onboarding_page'; import { SvlObltOnboardingStreamLogFilePageProvider } from './svl_oblt_onboarding_stream_log_file'; import { SvlObltOverviewPageProvider } from './svl_oblt_overview_page'; -import { SvlSearchLandingPageProvider } from './svl_search_landing_page'; import { SvlSecLandingPageProvider } from './svl_sec_landing_page'; -import { SvlSearchConnectorsPageProvider } from './svl_search_connectors_page'; -import { SvlSearchHomePageProvider } from './svl_search_homepage'; -import { SvlSearchIndexDetailPageProvider } from './svl_search_index_detail_page'; -import { SvlSearchElasticsearchStartPageProvider } from './svl_search_elasticsearch_start_page'; -import { SvlSearchCreateIndexPageProvider } from './svl_search_create_index_page'; -import { SvlSearchInferenceManagementPageProvider } from './svl_search_inference_management_page'; import { CspDashboardPageProvider } from './csp_dashboard_page'; import { AddCisIntegrationFormPageProvider } from './add_cis_integration_form_page'; import { CspSecurityCommonProvider } from './security_common'; @@ -38,19 +31,12 @@ export const pageObjects = { svlObltOnboardingPage: SvlObltOnboardingPageProvider, SvlObltOnboardingStreamLogFilePage: SvlObltOnboardingStreamLogFilePageProvider, svlObltOverviewPage: SvlObltOverviewPageProvider, - svlSearchConnectorsPage: SvlSearchConnectorsPageProvider, - svlSearchLandingPage: SvlSearchLandingPageProvider, svlSecLandingPage: SvlSecLandingPageProvider, svlTriggersActionsUI: SvlTriggersActionsPageProvider, svlRuleDetailsUI: SvlRuleDetailsPageProvider, svlManagementPage: SvlManagementPageProvider, svlIngestPipelines: SvlIngestPipelines, - svlSearchHomePage: SvlSearchHomePageProvider, - svlSearchIndexDetailPage: SvlSearchIndexDetailPageProvider, - svlSearchElasticsearchStartPage: SvlSearchElasticsearchStartPageProvider, svlApiKeys: SvlApiKeysProvider, - svlSearchCreateIndexPage: SvlSearchCreateIndexPageProvider, - svlSearchInferenceManagementPage: SvlSearchInferenceManagementPageProvider, svlDataUsagePage: SvlDataUsagePageProvider, // Cloud Security Posture specific page objects cloudPostureDashboard: CspDashboardPageProvider, diff --git a/x-pack/test_serverless/functional/services/index.ts b/x-pack/test_serverless/functional/services/index.ts index 16e231394bbd0..037e404f8cd4c 100644 --- a/x-pack/test_serverless/functional/services/index.ts +++ b/x-pack/test_serverless/functional/services/index.ts @@ -15,7 +15,6 @@ import { services as deploymentAgnosticFunctionalServices } from './deployment_a import { services as svlSharedServices } from '../../shared/services'; import { SvlChatNavigationServiceProvider } from './svl_chat_navigation'; import { SvlObltNavigationServiceProvider } from './svl_oblt_navigation'; -import { SvlSearchNavigationServiceProvider } from './svl_search_navigation'; import { SvlSecNavigationServiceProvider } from './svl_sec_navigation'; import { SvlCasesServiceProvider } from '../../api_integration/services/svl_cases'; import { services as SvlApiIntegrationSvcs } from '../../api_integration/services'; @@ -29,7 +28,6 @@ export const services = { svlChatNavigation: SvlChatNavigationServiceProvider, svlCommonNavigation: SvlCommonNavigationServiceProvider, svlObltNavigation: SvlObltNavigationServiceProvider, - svlSearchNavigation: SvlSearchNavigationServiceProvider, svlSecNavigation: SvlSecNavigationServiceProvider, svlCommonScreenshots: SvlCommonScreenshotsProvider, svlCases: SvlCasesServiceProvider, diff --git a/x-pack/test_serverless/functional/test_suites/search/index.ts b/x-pack/test_serverless/functional/test_suites/search/index.ts deleted file mode 100644 index bfe28b33ca552..0000000000000 --- a/x-pack/test_serverless/functional/test_suites/search/index.ts +++ /dev/null @@ -1,35 +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 - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FtrProviderContext } from '../../ftr_provider_context'; - -export default function ({ loadTestFile }: FtrProviderContext) { - describe('serverless search UI', function () { - this.tags(['esGate']); - - loadTestFile(require.resolve('./navigation')); - loadTestFile(require.resolve('./elasticsearch_start.ts')); - loadTestFile(require.resolve('./search_homepage')); - loadTestFile(require.resolve('./search_index_detail.ts')); - loadTestFile(require.resolve('./getting_started')); - loadTestFile(require.resolve('./index_management')); - loadTestFile(require.resolve('./connectors/connectors_overview')); - loadTestFile(require.resolve('./default_dataview')); - loadTestFile(require.resolve('./pipelines')); - loadTestFile(require.resolve('./cases/attachment_framework')); - loadTestFile(require.resolve('./dashboards/build_dashboard')); - loadTestFile(require.resolve('./dashboards/import_dashboard')); - loadTestFile(require.resolve('./advanced_settings')); - loadTestFile(require.resolve('./rules/rule_details')); - loadTestFile(require.resolve('./console_notebooks')); - loadTestFile(require.resolve('./search_playground/playground_overview')); - loadTestFile(require.resolve('./ml')); - loadTestFile(require.resolve('./custom_role_access')); - loadTestFile(require.resolve('./inference_management')); - loadTestFile(require.resolve('./search_query_rules/search_query_rules_overview')); - }); -} diff --git a/x-pack/test_serverless/tsconfig.json b/x-pack/test_serverless/tsconfig.json index b980ebf55afee..37f311f590b36 100644 --- a/x-pack/test_serverless/tsconfig.json +++ b/x-pack/test_serverless/tsconfig.json @@ -42,7 +42,6 @@ "@kbn/dev-utils", "@kbn/rison", "@kbn/serverless-observability-settings", - "@kbn/serverless-search-settings", "@kbn/serverless-security-settings", "@kbn/cloud-security-posture-plugin", "@kbn/reporting-plugin",