From 0aadbdc4b9b9c698486bfbe6f97a60ccab0a495a Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Fri, 10 May 2024 13:02:38 +0200 Subject: [PATCH] Serverless search tests - recreate default dataview --- .../test_serverless/api_integration/services/index.ts | 2 -- .../functional/test_suites/search/default_dataview.ts | 10 +++++++++- .../services/data_view_api.ts | 2 +- x-pack/test_serverless/shared/services/index.ts | 2 ++ 4 files changed, 12 insertions(+), 4 deletions(-) rename x-pack/test_serverless/{api_integration => shared}/services/data_view_api.ts (95%) diff --git a/x-pack/test_serverless/api_integration/services/index.ts b/x-pack/test_serverless/api_integration/services/index.ts index cbf6a099966d4..844c9339cf8ac 100644 --- a/x-pack/test_serverless/api_integration/services/index.ts +++ b/x-pack/test_serverless/api_integration/services/index.ts @@ -11,7 +11,6 @@ import { services as svlSharedServices } from '../../shared/services'; import { AlertingApiProvider } from './alerting_api'; import { SamlToolsProvider } from './saml_tools'; -import { DataViewApiProvider } from './data_view_api'; import { SvlCasesServiceProvider } from './svl_cases'; import { SloApiProvider } from './slo_api'; import { TransformProvider } from './transform'; @@ -24,7 +23,6 @@ export const services = { ...svlSharedServices, alertingApi: AlertingApiProvider, samlTools: SamlToolsProvider, - dataViewApi: DataViewApiProvider, svlCases: SvlCasesServiceProvider, sloApi: SloApiProvider, transform: TransformProvider, diff --git a/x-pack/test_serverless/functional/test_suites/search/default_dataview.ts b/x-pack/test_serverless/functional/test_suites/search/default_dataview.ts index a40564d30481d..1b32eaefc2061 100644 --- a/x-pack/test_serverless/functional/test_suites/search/default_dataview.ts +++ b/x-pack/test_serverless/functional/test_suites/search/default_dataview.ts @@ -12,18 +12,26 @@ export default function ({ getPageObject, getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const svlCommonNavigation = getPageObject('svlCommonNavigation'); const svlCommonPage = getPageObject('svlCommonPage'); + const dataViewApi = getService('dataViewApi'); describe('default dataView', function () { before(async () => { await svlCommonPage.login(); await svlSearchNavigation.navigateToLandingPage(); + + // re-create the default data view in case it has been cleaned up by another test + await dataViewApi.create({ + id: 'default_all_data_id', + name: 'default:all-data', + title: '*,-.*', + }); }); after(async () => { await svlCommonPage.forceLogout(); }); - it('should show dashboard but with no data', async () => { + it('should show discover but with no data', async () => { await svlCommonNavigation.sidenav.clickLink({ deepLinkId: 'discover' }); await testSubjects.existOrFail('~breadcrumb-deepLinkId-discover'); await testSubjects.existOrFail('discover-dataView-switch-link'); diff --git a/x-pack/test_serverless/api_integration/services/data_view_api.ts b/x-pack/test_serverless/shared/services/data_view_api.ts similarity index 95% rename from x-pack/test_serverless/api_integration/services/data_view_api.ts rename to x-pack/test_serverless/shared/services/data_view_api.ts index 430ff60aac1e2..f694039eea334 100644 --- a/x-pack/test_serverless/api_integration/services/data_view_api.ts +++ b/x-pack/test_serverless/shared/services/data_view_api.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrProviderContext } from '../ftr_provider_context'; +import { FtrProviderContext } from '../../functional/ftr_provider_context'; export function DataViewApiProvider({ getService }: FtrProviderContext) { const supertest = getService('supertest'); diff --git a/x-pack/test_serverless/shared/services/index.ts b/x-pack/test_serverless/shared/services/index.ts index b8cfbaffc3683..98a6eee96514b 100644 --- a/x-pack/test_serverless/shared/services/index.ts +++ b/x-pack/test_serverless/shared/services/index.ts @@ -9,6 +9,7 @@ import { SupertestProvider, SupertestWithoutAuthProvider } from './supertest'; import { SvlCommonApiServiceProvider } from './svl_common_api'; import { SvlReportingServiceProvider } from './svl_reporting'; import { SvlUserManagerProvider } from './svl_user_manager'; +import { DataViewApiProvider } from './data_view_api'; export type { RoleCredentials } from './svl_user_manager'; @@ -18,4 +19,5 @@ export const services = { svlCommonApi: SvlCommonApiServiceProvider, svlReportingApi: SvlReportingServiceProvider, svlUserManager: SvlUserManagerProvider, + dataViewApi: DataViewApiProvider, };