diff --git a/CHANGELOG.md b/CHANGELOG.md index 224025a..290187d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Changelog -## 4.1.0 (2024-06-24) +## 4.1.0 (2024-06-25) ### Features / Enhancements - Added supporting OpenAI completions (#73) -- Update E2E workflow to use Docker (#75) +- Update E2E workflow to use Docker (#75, #77) - Update plugin logo (#76) ## 4.0.0 (2024-06-12) diff --git a/docker-compose.yml b/docker-compose.yml index a7a5784..79d9776 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: environment: - GF_DEFAULT_APP_MODE=development - GF_USERS_DEFAULT_THEME=light - - GF_INSTALL_PLUGINS=volkovlabs-image-panel,marcusolsson-dynamictext-panel + - GF_INSTALL_PLUGINS=volkovlabs-image-panel,marcusolsson-dynamictext-panel,grafana-llm-app volumes: - ./dist:/var/lib/grafana/plugins/marcusolsson-static-datasource - ./provisioning:/etc/grafana/provisioning diff --git a/package.json b/package.json index 8d220d3..8047e14 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "stop:e2e": "docker-compose -f test/docker-compose.yml down", "test": "jest --watch --onlyChanged", "test:e2e": "npx playwright test", - "test:e2e:docker": "docker compose --profile e2e up", + "test:e2e:docker": "docker compose --profile e2e up --exit-code-from test", "test:ci": "jest --maxWorkers 4 --coverage", "upgrade": "npm upgrade --save" }, diff --git a/test/panel.spec.ts b/test/panel.spec.ts index 0cc5f29..4c3ae6b 100644 --- a/test/panel.spec.ts +++ b/test/panel.spec.ts @@ -27,16 +27,10 @@ test.describe('Static Data Source', () => { /** * Check content */ - await expect(dashboardPage.getPanelByTitle('Logs').locator.locator('tr').nth(0)).toHaveText( - '2022-11-01 07:27:25.648user logged in' - ); + await expect(dashboardPage.getPanelByTitle('Logs').locator.locator('tr').nth(0)).toContainText('user logged in'); - await expect(dashboardPage.getPanelByTitle('Logs').locator.locator('tr').nth(1)).toHaveText( - '2022-11-01 07:27:15.826user login failed' - ); + await expect(dashboardPage.getPanelByTitle('Logs').locator.locator('tr').nth(1)).toContainText('user login failed'); - await expect(dashboardPage.getPanelByTitle('Logs').locator.locator('tr').nth(2)).toHaveText( - '2022-11-01 07:27:06.074user registered' - ); + await expect(dashboardPage.getPanelByTitle('Logs').locator.locator('tr').nth(2)).toContainText('user registered'); }); });