@grafana/plugin-e2e 1.11.0 → 1.11.1

package/dist/fixtures/commands/createDataSource.d.ts

@@ -1,6 +1,7 @@
-import { APIRequestContext, TestFixture } from '@playwright/test';
+import { TestFixture } from '@playwright/test';
 import { CreateDataSourceArgs, DataSourceSettings, PlaywrightArgs } from '../../types';
+import { GrafanaAPIClient } from '../../models/GrafanaAPIClient';
 type CreateDataSourceViaAPIFixture = TestFixture<(args: CreateDataSourceArgs) => Promise<DataSourceSettings>, PlaywrightArgs>;
-export declare const createDataSourceViaAPI: (request: APIRequestContext, datasource: CreateDataSourceArgs) => Promise<DataSourceSettings>;
+export declare const createDataSourceViaAPI: (grafanaAPIClient: GrafanaAPIClient, datasource: CreateDataSourceArgs) => Promise<DataSourceSettings>;
 export declare const createDataSource: CreateDataSourceViaAPIFixture;
 export {};

package/dist/fixtures/commands/createDataSource.js

@@ -3,24 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDataSource = exports.createDataSourceViaAPI = void 0;
 const uuid_1 = require("uuid");
 const test_1 = require("@playwright/test");
-const createDataSourceViaAPI = async (request, datasource) => {
+const createDataSourceViaAPI = async (grafanaAPIClient, datasource) => {
     const { type, name } = datasource;
     const dsName = name ?? `${type}-${(0, uuid_1.v4)()}`;
-    const existingDataSource = await request.get(`/api/datasources/name/${dsName}`);
-    if (await existingDataSource.ok()) {
+    const existingDataSource = await grafanaAPIClient.getDataSourceByName(dsName);
+    if (existingDataSource.ok()) {
         const json = await existingDataSource.json();
-        await request.delete(`/api/datasources/uid/${json.uid}`);
+        await grafanaAPIClient.deleteDataSourceByUID(json.uid);
     }
-    const createDsReq = await request.post('/api/datasources', {
-        data: {
-            ...datasource,
-            name: dsName,
-            access: 'proxy',
-            isDefault: false,
-        },
-    });
+    const createDsReq = await grafanaAPIClient.createDataSource(datasource, dsName);
     const text = await createDsReq.text();
-    const status = await createDsReq.status();
+    const status = createDsReq.status();
     if (status === 200) {
         return createDsReq.json().then((r) => r.datasource);
     }
@@ -28,9 +21,9 @@ const createDataSourceViaAPI = async (request, datasource) => {
     return existingDataSource.json();
 };
 exports.createDataSourceViaAPI = createDataSourceViaAPI;
-const createDataSource = async ({ request }, use) => {
+const createDataSource = async ({ grafanaAPIClient }, use) => {
     await use(async (args) => {
-        return (0, exports.createDataSourceViaAPI)(request, args);
+        return (0, exports.createDataSourceViaAPI)(grafanaAPIClient, args);
     });
 };
 exports.createDataSource = createDataSource;

package/dist/fixtures/commands/createDataSourceConfigPage.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDataSourceConfigPage = void 0;
 const createDataSource_1 = require("./createDataSource");
 const DataSourceConfigPage_1 = require("../../models/pages/DataSourceConfigPage");
-const createDataSourceConfigPage = async ({ request, page, selectors, grafanaVersion }, use, testInfo) => {
+const createDataSourceConfigPage = async ({ request, page, selectors, grafanaVersion, grafanaAPIClient }, use, testInfo) => {
     let datasourceConfigPage;
     let deleteDataSource = true;
     await use(async (args) => {
         deleteDataSource = args.deleteDataSourceAfterTest ?? true;
-        const datasource = await (0, createDataSource_1.createDataSourceViaAPI)(request, args);
+        const datasource = await (0, createDataSource_1.createDataSourceViaAPI)(grafanaAPIClient, args);
         datasourceConfigPage = new DataSourceConfigPage_1.DataSourceConfigPage({ page, selectors, grafanaVersion, request, testInfo }, datasource);
         await datasourceConfigPage.goto();
         return datasourceConfigPage;

package/dist/models/GrafanaAPIClient.d.ts

@@ -1,9 +1,12 @@
 import { APIRequestContext } from '@playwright/test';
-import { DataSourceSettings, User } from '../types';
+import { CreateDataSourceArgs, DataSourceSettings, User } from '../types';
 export declare class GrafanaAPIClient {
     private request;
     constructor(request: APIRequestContext);
     getUserIdByUsername(userName: string): Promise<any>;
     createUser(user: User): Promise<void>;
     getDataSourceSettingsByUID(uid: string): Promise<DataSourceSettings<{}, {}>>;
+    createDataSource(datasource: CreateDataSourceArgs, dsName: string): Promise<import("@playwright/test").APIResponse>;
+    getDataSourceByName(name: string): Promise<import("@playwright/test").APIResponse>;
+    deleteDataSourceByUID(uid: string): Promise<import("@playwright/test").APIResponse>;
 }

package/dist/models/GrafanaAPIClient.js

@@ -48,5 +48,21 @@ class GrafanaAPIClient {
         const settings = await response.json();
         return settings;
     }
+    async createDataSource(datasource, dsName) {
+        return this.request.post('/api/datasources', {
+            data: {
+                ...datasource,
+                name: dsName,
+                access: 'proxy',
+                isDefault: false,
+            },
+        });
+    }
+    async getDataSourceByName(name) {
+        return this.request.get(`/api/datasources/name/${name}`);
+    }
+    async deleteDataSourceByUID(uid) {
+        return this.request.delete(`/api/datasources/uid/${uid}`);
+    }
 }
 exports.GrafanaAPIClient = GrafanaAPIClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -43,7 +43,7 @@
     "dotenv": "^16.3.1"
   },
   "dependencies": {
-    "@grafana/e2e-selectors": "^11.4.0-204289",
+    "@grafana/e2e-selectors": "^11.4.0-205417",
     "semver": "^7.5.4",
     "uuid": "^10.0.0",
     "yaml": "^2.3.4"
@@ -57,5 +57,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "a32474dd64c95853344a52236d647ddc503547e6"
+  "gitHead": "8464893065b24f1b9e076d937ebf21f5c20047b2"
 }