@grafana/create-plugin 4.8.0-canary.892.e66359c.0 → 4.8.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v4.8.0 (Wed Apr 24 2024)
+
+#### 🚀 Enhancement
+
+- Create Plugins: Use non dev docker image on e2e [#883](https://github.com/grafana/plugin-tools/pull/883) ([@oshirohugo](https://github.com/oshirohugo))
+
+#### Authors: 1
+
+- Hugo Kiyodi Oshiro ([@oshirohugo](https://github.com/oshirohugo))
+
+---
+
 # v4.7.0 (Thu Apr 18 2024)
 
 #### 🚀 Enhancement

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "4.8.0-canary.892.e66359c.0",
+  "version": "4.8.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -87,5 +87,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "e66359c3d14c4cac3ec0db8486a43bc78a84a45a"
+  "gitHead": "96389ff99fec497ed6b2ab509709d578ecaf13f0"
 }

package/templates/app/tests/appConfig.spec.ts

@@ -1,7 +1,7 @@
 import { test, expect } from './fixtures';
 
 test('should be possible to save app configuration', async ({ appConfigPage, page }) => {
-  const saveButton = page.getByRole('button', { name: /Save API settings/i });
+  const saveForm = page.getByRole('button', { name: /Save API settings/i });
 
   // reset the configured secret
   await page.getByRole('button', { name: /reset/i }).click();
@@ -14,6 +14,6 @@ test('should be possible to save app configuration', async ({ appConfigPage, pag
   // listen for the server response on the saved form
   const saveResponse = appConfigPage.waitForSettingsResponse();
 
-  await saveButton.click();
+  await saveForm.click();
   await expect(saveResponse).toBeOK();
 });

package/templates/app/tests/appNavigation.spec.ts

@@ -1,25 +1,26 @@
-import { test, expect } from './fixtures';
+import pluginJson from '../src/plugin.json';
+import { test, expect } from '@grafana/plugin-e2e';
 import { ROUTES } from '../src/constants';
 
 test.describe('navigating app', () => {
-  test('page one should render successfully', async ({ gotoPage, page }) => {
-    await gotoPage(`/${ROUTES.One}`);
+  test('page one should render successfully', async ({ page }) => {
+    await page.goto(`/a/${pluginJson.id}/${ROUTES.One}`);
     await expect(page.getByText('This is page one.')).toBeVisible();
   });
 
-  test('page two should render successfully', async ({ gotoPage, page }) => {
-    await gotoPage(`/${ROUTES.Two}`);
+  test('page two should render successfully', async ({ page }) => {
+    await page.goto(`/a/${pluginJson.id}/${ROUTES.Two}`);
     await expect(page.getByText('This is page two.')).toBeVisible();
   });
 
-  test('page three should support an id parameter', async ({ gotoPage, page }) => {
-    await gotoPage(`/${ROUTES.Three}/123456`);
+  test('page three should support an id parameter', async ({ page }) => {
+    await page.goto(`/a/${pluginJson.id}/${ROUTES.Three}/123456`);
     await expect(page.getByText('ID: 123456')).toBeVisible();
   });
 
-  test('page three should render sucessfully', async ({ gotoPage, page }) => {
+  test('page three should render sucessfully', async ({ page }) => {
     // wait for page to successfully render
-    await gotoPage(`/${ROUTES.One}`);
+    await page.goto(`/a/${pluginJson.id}/${ROUTES.One}`);
     await expect(page.getByText('This is page one.')).toBeVisible();
 
     // navigating to page four with full width layout without sidebar menu

package/templates/app/tests/fixtures.ts

@@ -1,26 +1,19 @@
-import { AppConfigPage, AppPage, test as base } from '@grafana/plugin-e2e';
+import { AppConfigPage, test as base } from '@grafana/plugin-e2e';
 import pluginJson from '../src/plugin.json';
 
-type AppTestFixture = {
-  appConfigPage: AppConfigPage;
-  gotoPage: (path?: string) => Promise<AppPage>;
-};
+type AppTestFixture = { appConfigPage: AppConfigPage };
 
 export const test = base.extend<AppTestFixture>({
-  appConfigPage: async ({ gotoAppConfigPage }, use) => {
-    const configPage = await gotoAppConfigPage({
-      pluginId: pluginJson.id,
-    });
-    await use(configPage);
-  },
-  gotoPage: async ({ gotoAppPage }, use) => {
-    await use((path) =>
-      gotoAppPage({
-        path,
+  appConfigPage: async ({ page, selectors, grafanaVersion, request }, use, testInfo) => {
+    const configPage = new AppConfigPage(
+      { page, selectors, grafanaVersion, request, testInfo },
+      {
         pluginId: pluginJson.id,
-      })
+      }
     );
+    await configPage.goto();
+    await use(configPage);
   },
 });
 
-export { expect } from '@grafana/plugin-e2e';
+export { expect } from '@grafana/plugin-e2e';

package/templates/common/docker-compose.yaml

@@ -11,6 +11,7 @@ services:
       args:
         grafana_image: ${GRAFANA_IMAGE:-{{~grafanaImage~}} }
         grafana_version: ${GRAFANA_VERSION:-{{~grafanaVersion~}} }
+        development: ${DEVELOPMENT:-true}
     ports:
       - 3000:3000/tcp
 {{#if hasBackend}}

package/templates/github/ci/.github/workflows/ci.yml

@@ -176,7 +176,7 @@ jobs:
       - name: Start Grafana
         run: |
           docker-compose pull
-          GRAFANA_VERSION=$\{{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=$\{{ matrix.GRAFANA_IMAGE.NAME }} docker-compose up -d
+          DEVELOPMENT=false GRAFANA_VERSION=$\{{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=$\{{ matrix.GRAFANA_IMAGE.NAME }} docker-compose up -d
 
       - name: Wait for Grafana to start
         uses: nev7n/wait_for_response@v1