Moves core metrics integration tests to a package

Bargs · Jan 30, 2023 · 4bcc5a1 · 4bcc5a1
1 parent 2a78b90
commit 4bcc5a1
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 2 deletions.
diff --git 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
@@ -0,0 +1,3 @@
+# @kbn/core-metrics-integration-tests
+
+This package contains the core metrics service api-integration tests
diff --git a/..._tests/metrics/jest.integration.config.js → ...egration-tests/jest.integration.config.js b/..._tests/metrics/jest.integration.config.js → ...egration-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: ['<rootDir>/src/core/server/integration_tests/metrics'],
+  rootDir: '../../../..',
+  roots: ['<rootDir>/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
@@ -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
@@ -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/...on_tests/metrics/server_collector.test.ts → ...ntegration-tests/server_collector.test.ts b/...on_tests/metrics/server_collector.test.ts → ...ntegration-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
@@ -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
@@ -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
@@ -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 ""