From efed4f756744ff332d50c76eec4d8544bdcf5f6e Mon Sep 17 00:00:00 2001 From: Elena Shostak Date: Mon, 30 Dec 2024 11:33:19 +0100 Subject: [PATCH] Fixes --- .../{stateful.common.config.ts => common/config.ts} | 8 ++++---- .../deployment_agnostic/stateful.config_trial.ts | 2 +- .../stateful.copy_to_space.config_trial.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename x-pack/test/spaces_api_integration/deployment_agnostic/{stateful.common.config.ts => common/config.ts} (85%) diff --git a/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.common.config.ts b/x-pack/test/spaces_api_integration/deployment_agnostic/common/config.ts similarity index 85% rename from x-pack/test/spaces_api_integration/deployment_agnostic/stateful.common.config.ts rename to x-pack/test/spaces_api_integration/deployment_agnostic/common/config.ts index 2f712a23565d3..f3f61e54d9237 100644 --- a/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.common.config.ts +++ b/x-pack/test/spaces_api_integration/deployment_agnostic/common/config.ts @@ -10,8 +10,8 @@ import path from 'path'; import { REPO_ROOT } from '@kbn/repo-info'; import type { FtrConfigProviderContext } from '@kbn/test'; -import { services } from './services'; -import { createStatefulTestConfig } from '../../api_integration/deployment_agnostic/default_configs/stateful.config.base'; +import { createStatefulTestConfig } from '../../../api_integration/deployment_agnostic/default_configs/stateful.config.base'; +import { services } from '../services'; export function createTestConfig({ license = 'trial', @@ -30,7 +30,7 @@ export function createTestConfig({ ), }, xpack: { - api: await readConfigFile(require.resolve('../../api_integration/config.ts')), + api: await readConfigFile(require.resolve('../../../api_integration/config.ts')), }, }; @@ -48,7 +48,7 @@ export function createTestConfig({ spaces: config.xpack.api.get('services.spaces'), usageAPI: config.xpack.api.get('services.usageAPI'), }, - testFiles: testFiles ?? [require.resolve('./security_and_spaces/apis')], + testFiles: testFiles ?? [require.resolve('../security_and_spaces/apis')], junit: { reportName: 'X-Pack Spaces API Integration Tests -- ', }, diff --git a/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.config_trial.ts b/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.config_trial.ts index 4f17b0f8b7f77..d28070aa237fc 100644 --- a/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.config_trial.ts +++ b/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.config_trial.ts @@ -5,6 +5,6 @@ * 2.0. */ -import { createTestConfig } from './stateful.common.config'; +import { createTestConfig } from './common/config'; export default createTestConfig({ license: 'trial' }); diff --git a/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.copy_to_space.config_trial.ts b/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.copy_to_space.config_trial.ts index ba437a4b9317a..f4ef249df1911 100644 --- a/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.copy_to_space.config_trial.ts +++ b/x-pack/test/spaces_api_integration/deployment_agnostic/stateful.copy_to_space.config_trial.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { createTestConfig } from './stateful.common.config'; +import { createTestConfig } from './common/config'; export default createTestConfig({ license: 'trial',