Re-enable e2e tests

Author: lpetrora

docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3.0'
-
 services:
   grafana:
     container_name: 'checkmk-cloud-datasource'
@@ -16,7 +14,7 @@ services:
     volumes:
       - ./dist:/var/lib/grafana/plugins/checkmk-cloud-datasource
       - ./provisioning:/etc/grafana/provisioning
-      - .:/root/checkmk-cmkgrafanadatasource2-datasource
+      - .:/root/checkmk-cloud-datasource
 
     environment:
       NODE_ENV: development

jest.config.js

@@ -6,5 +6,6 @@ process.env.TZ = 'UTC';
 module.exports = {
   // Jest configuration provided by Grafana scaffolding
   ...require('./.config/jest.config'),
-  testMatch: ['**/tests/unit/**/*'],
+  //testMatch: ['<rootDir>/test/unit/**/*.{spec,test,jest}.{js,jsx,ts,tsx}'],
+  testMatch: ['**/tests/unit/**/*.{spec,test,jest}.{js,jsx,ts,tsx}'],
 };

package-lock.json

@@ -5,6 +5,7 @@
   "scripts": {
     "build": "webpack -c ./webpack.config.ts --env production",
     "build:cloud": "webpack -c ./webpack.config.ts --env production",
+    "build:dev": "webpack -c ./webpack.config.ts --env development",
     "dev": "webpack -w -c ./webpack.config.ts --env development",
     "test": "jest --watch --onlyChanged",
     "test:ci": "jest --passWithNoTests --maxWorkers 4",
@@ -25,28 +26,28 @@
   "author": "Checkmk",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/core": "^7.26.10",
+    "@babel/core": "^7.27.1",
     "@grafana/eslint-config": "^7.0.0",
     "@grafana/plugin-e2e": "^1.19.4",
     "@grafana/tsconfig": "^2.0.0",
-    "@playwright/test": "^1.51.1",
-    "@swc/core": "^1.11.18",
+    "@playwright/test": "^1.52.0",
+    "@swc/core": "^1.11.24",
     "@swc/helpers": "^0.5.15",
     "@swc/jest": "^0.2.37",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.3.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/jest": "^29.5.14",
     "@types/lodash": "^4.17.16",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.15.19",
     "@types/react-router-dom": "^5.3.3",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "eslint-plugin-deprecation": "^3.0.0",
     "eslint-webpack-plugin": "^4.2.0",
     "fork-ts-checker-webpack-plugin": "^9.1.0",
-    "glob": "^11.0.1",
+    "glob": "^11.0.2",
     "identity-obj-proxy": "3.0.0",
     "imports-loader": "^5.0.0",
     "jest": "^29.7.0",
@@ -55,14 +56,14 @@
     "react-intersection-observer": "^9.16.0",
     "react-select-event": "^5.5.1",
     "replace-in-file-webpack-plugin": "^1.0.6",
-    "sass": "1.86.3",
+    "sass": "1.89.0",
     "sass-loader": "16.0.5",
     "style-loader": "4.0.0",
     "swc-loader": "^0.2.6",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.8.3",
-    "webpack": "^5.99.5",
+    "webpack": "^5.99.8",
     "webpack-cli": "^5.1.4",
     "webpack-livereload-plugin": "^3.0.2"
   },
@@ -71,10 +72,10 @@
   },
   "dependencies": {
     "@emotion/css": "^11.13.5",
-    "@grafana/data": "^11.6.0",
-    "@grafana/runtime": "^11.6.0",
-    "@grafana/schema": "^11.6.0",
-    "@grafana/ui": "^11.6.0",
+    "@grafana/data": "^11.5.3",
+    "@grafana/runtime": "^11.5.3",
+    "@grafana/schema": "^11.5.3",
+    "@grafana/ui": "^11.5.3",
     "process": "^0.11.10",
     "react": "18.3.1",
     "react-dom": "18.3.1",

package.json

@@ -7,6 +7,10 @@ export default defineConfig<PluginOptions>({
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 3 : 0,
+  expect: {
+    timeout: 20_000,
+  },
+  timeout: 60_000,
   workers: 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'list',
@@ -15,6 +19,7 @@ export default defineConfig<PluginOptions>({
     video: 'retain-on-failure',
     screenshot: 'only-on-failure',
     viewport: { width: 1920, height: 1080 },
+    testIdAttribute: 'data-test-id',
     baseURL: process.env.PLAYWRIGHT_TO_GRAFANA_URL || 'http://localhost:3003',
     grafanaAPICredentials: {
       user: process.env.GRAFANA_USER || 'admin',
@@ -23,27 +28,21 @@ export default defineConfig<PluginOptions>({
   },
   projects: [
     {
-      name: 'e2e tests',
+      name: 'tests',
       testDir: './tests/e2e/tests',
-      testMatch: ['**/disabled.test.ts'],
+      testMatch: ['**/*.test.ts'],
+      dependencies: ['setup'],
+    },
+    {
+      name: 'setup',
+      testDir: './tests/e2e/tests',
+      testMatch: 'global.setup.ts',
+      teardown: 'tearDown',
+    },
+    {
+      name: 'tearDown',
+      testDir: './tests/e2e/tests',
+      testMatch: 'global.teardown.ts',
     },
-
-    // {
-    //   name: 'e2e tests',
-    //   testDir: './tests/e2e/tests',
-    //   testMatch: ['**/*.test.ts'],
-    //   dependencies: ['setup'],
-    // },
-    // {
-    //   name: 'setup',
-    //   testDir: './tests/e2e/tests',
-    //   testMatch: 'global.setup.ts',
-    //   teardown: 'tearDown',
-    // },
-    // {
-    //   name: 'tearDown',
-    //   testDir: './tests/e2e/tests',
-    //   testMatch: 'global.teardown.ts',
-    // },
   ],
 });

playwright.config.ts

@@ -102,7 +102,7 @@ export const ConfigEditor = (props: Props) => {
             onChange={onUrlChange}
             value={settings.url || ''}
             tooltip="Which Checkmk Server to connect to. (Example: https://checkmk.server/site)"
-            data-testid="checkmk-url"
+            data-test-id="checkmk-url"
           />
         </div>
         <InlineField label="Edition" labelWidth={12}>
@@ -113,7 +113,7 @@ export const ConfigEditor = (props: Props) => {
             value={settings.edition}
             placeholder="Select your checkmk edition"
             inputId="checkmk-edition"
-            data-testid="checkmk-edition"
+            data-test-id="checkmk-edition"
           />
         </InlineField>
       </FieldSet>
@@ -126,7 +126,7 @@ export const ConfigEditor = (props: Props) => {
             onChange={onUsernameChange}
             value={settings.username}
             tooltip="A checkmk monitoring user. Don't use 'automation' user, because it has admin rights."
-            data-testid="checkmk-username"
+            data-test-id="checkmk-username"
           />
         </div>
         <div className="gf-form">
@@ -140,7 +140,7 @@ export const ConfigEditor = (props: Props) => {
             onReset={onResetSecret}
             onChange={onSecretChange}
             tooltip="You can find the secret for your user in your checkmk server under Users."
-            data-testid="checkmk-password"
+            data-test-id="checkmk-password"
           />
         </div>
       </FieldSet>

src/ui/ConfigEditor.tsx

@@ -0,0 +1,2 @@
+results/
+unit/

tests/.dockerignore

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.46.1-jammy
+FROM mcr.microsoft.com/playwright:v1.52.0-noble
 
 WORKDIR /app
 

tests/Dockerfile

@@ -1,14 +1,12 @@
 #!/usr/bin/env bash
+# This script runs while the site is still stopped
+
 su - cmk -c "/usr/bin/env bash" << __EOF__
 echo abskjfdalkdhjbld | cmk-passwd cmkadmin -i
 echo "Admin password set"
 
-omd stop
 omd config set MKEVENTD off
 omd config set AGENT_RECEIVER off
 omd config set LIVEPROXYD off
-omd config set TRACE_SEND off
-omd config set TRACE_RECEIVE off
-omd start
-echo "Event console, agent receiver, liveproxy, and trace disabled"
+echo "Event console, liveproxy, and trace disabled"
 __EOF__