From 4bcc5a1da8757182a2238edbc90d219fefb01522 Mon Sep 17 00:00:00 2001 From: "Christiane (Tina) Heiligers" Date: Fri, 27 Jan 2023 16:43:52 -0700 Subject: [PATCH] Moves core metrics integration tests to a package --- package.json | 2 ++ .../core-metrics-integration-tests/README.md | 3 +++ .../jest.integration.config.js | 4 ++-- .../core-metrics-integration-tests/kibana.jsonc | 6 ++++++ .../core-metrics-integration-tests/package.json | 7 +++++++ .../server_collector.test.ts | 0 .../tsconfig.json | 17 +++++++++++++++++ tsconfig.base.json | 2 ++ yarn.lock | 8 ++++++++ 9 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 packages/core/metrics/core-metrics-integration-tests/README.md rename {src/core/server/integration_tests/metrics => packages/core/metrics/core-metrics-integration-tests}/jest.integration.config.js (87%) create mode 100644 packages/core/metrics/core-metrics-integration-tests/kibana.jsonc create mode 100644 packages/core/metrics/core-metrics-integration-tests/package.json rename {src/core/server/integration_tests/metrics => packages/core/metrics/core-metrics-integration-tests}/server_collector.test.ts (100%) create mode 100644 packages/core/metrics/core-metrics-integration-tests/tsconfig.json diff --git a/package.json b/package.json index 3c64f712be7f48a..89b9e598c94625c 100644 --- a/package.json +++ b/package.json @@ -751,8 +751,10 @@ "@kbn/core-lifecycle-browser-mocks": "link:packages/core/lifecycle/core-lifecycle-browser-mocks", "@kbn/core-lifecycle-server-mocks": "link:packages/core/lifecycle/core-lifecycle-server-mocks", "@kbn/core-logging-browser-mocks": "link:packages/core/logging/core-logging-browser-mocks", + "@kbn/core-logging-integration-tests": "link:packages/core/logging/core-logging-integration-tests", "@kbn/core-logging-server-mocks": "link:packages/core/logging/core-logging-server-mocks", "@kbn/core-metrics-collectors-server-mocks": "link:packages/core/metrics/core-metrics-collectors-server-mocks", + "@kbn/core-metrics-integration-tests": "link:packages/core/metrics/core-metrics-integration-tests", "@kbn/core-metrics-server-mocks": "link:packages/core/metrics/core-metrics-server-mocks", "@kbn/core-node-server-mocks": "link:packages/core/node/core-node-server-mocks", "@kbn/core-notifications-browser-mocks": "link:packages/core/notifications/core-notifications-browser-mocks", diff --git a/packages/core/metrics/core-metrics-integration-tests/README.md b/packages/core/metrics/core-metrics-integration-tests/README.md new file mode 100644 index 000000000000000..ab029519bb0a35b --- /dev/null +++ b/packages/core/metrics/core-metrics-integration-tests/README.md @@ -0,0 +1,3 @@ +# @kbn/core-metrics-integration-tests + +This package contains the core metrics service api-integration tests diff --git a/src/core/server/integration_tests/metrics/jest.integration.config.js b/packages/core/metrics/core-metrics-integration-tests/jest.integration.config.js similarity index 87% rename from src/core/server/integration_tests/metrics/jest.integration.config.js rename to packages/core/metrics/core-metrics-integration-tests/jest.integration.config.js index d55cb61f4257164..f98332644dce23e 100644 --- a/src/core/server/integration_tests/metrics/jest.integration.config.js +++ b/packages/core/metrics/core-metrics-integration-tests/jest.integration.config.js @@ -12,8 +12,8 @@ module.exports = { // to do so, we must fix all integration tests first // see https://github.com/elastic/kibana/pull/130255/ preset: '@kbn/test/jest_integration', - rootDir: '../../../../..', - roots: ['/src/core/server/integration_tests/metrics'], + rootDir: '../../../..', + roots: ['/packages/core/metrics/core-metrics-integration-tests'], // must override to match all test given there is no `integration_tests` subfolder testMatch: ['**/*.test.{js,mjs,ts,tsx}'], }; diff --git a/packages/core/metrics/core-metrics-integration-tests/kibana.jsonc b/packages/core/metrics/core-metrics-integration-tests/kibana.jsonc new file mode 100644 index 000000000000000..9bada4ff9939ea1 --- /dev/null +++ b/packages/core/metrics/core-metrics-integration-tests/kibana.jsonc @@ -0,0 +1,6 @@ +{ + "type": "shared-common", + "id": "@kbn/core-metrics-integration-tests", + "devOnly": true, + "owner": "@elastic/kibana-core" +} diff --git a/packages/core/metrics/core-metrics-integration-tests/package.json b/packages/core/metrics/core-metrics-integration-tests/package.json new file mode 100644 index 000000000000000..aa7ff04bdd80de8 --- /dev/null +++ b/packages/core/metrics/core-metrics-integration-tests/package.json @@ -0,0 +1,7 @@ +{ + "name": "@kbn/core-metrics-integration-tests", + "private": true, + "version": "1.0.0", + "author": "Kibana Core", + "license": "SSPL-1.0 OR Elastic License 2.0" +} diff --git a/src/core/server/integration_tests/metrics/server_collector.test.ts b/packages/core/metrics/core-metrics-integration-tests/server_collector.test.ts similarity index 100% rename from src/core/server/integration_tests/metrics/server_collector.test.ts rename to packages/core/metrics/core-metrics-integration-tests/server_collector.test.ts diff --git a/packages/core/metrics/core-metrics-integration-tests/tsconfig.json b/packages/core/metrics/core-metrics-integration-tests/tsconfig.json new file mode 100644 index 000000000000000..0d78dace105e1d7 --- /dev/null +++ b/packages/core/metrics/core-metrics-integration-tests/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "target/types", + "types": [ + "jest", + "node" + ] + }, + "include": [ + "**/*.ts", + ], + "exclude": [ + "target/**/*" + ], + "kbn_references": [] +} diff --git a/tsconfig.base.json b/tsconfig.base.json index d319d6690fc8f33..5f7572365d65d89 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -386,6 +386,8 @@ "@kbn/core-metrics-collectors-server-internal/*": ["packages/core/metrics/core-metrics-collectors-server-internal/*"], "@kbn/core-metrics-collectors-server-mocks": ["packages/core/metrics/core-metrics-collectors-server-mocks"], "@kbn/core-metrics-collectors-server-mocks/*": ["packages/core/metrics/core-metrics-collectors-server-mocks/*"], + "@kbn/core-metrics-integration-tests": ["packages/core/metrics/core-metrics-integration-tests"], + "@kbn/core-metrics-integration-tests/*": ["packages/core/metrics/core-metrics-integration-tests/*"], "@kbn/core-metrics-server": ["packages/core/metrics/core-metrics-server"], "@kbn/core-metrics-server/*": ["packages/core/metrics/core-metrics-server/*"], "@kbn/core-metrics-server-internal": ["packages/core/metrics/core-metrics-server-internal"], diff --git a/yarn.lock b/yarn.lock index b9a636c79fccf24..b3d9bf61007d42b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3317,6 +3317,10 @@ version "0.0.0" uid "" +"@kbn/core-logging-integration-tests@link:packages/core/logging/core-logging-integration-tests": + version "0.0.0" + uid "" + "@kbn/core-logging-server-internal@link:packages/core/logging/core-logging-server-internal": version "0.0.0" uid "" @@ -3337,6 +3341,10 @@ version "0.0.0" uid "" +"@kbn/core-metrics-integration-tests@link:packages/core/metrics/core-metrics-integration-tests": + version "0.0.0" + uid "" + "@kbn/core-metrics-server-internal@link:packages/core/metrics/core-metrics-server-internal": version "0.0.0" uid ""