@grafana/plugin-e2e 1.3.0-canary.930.bdc666d.0 → 1.3.0

package/dist/auth/auth.setup.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const __1 = require("../");
 (0, __1.test)('authenticate', async ({ login, createUser, user }) => {
-    if (user && !user.skipCreateUser) {
+    if (user) {
         await createUser();
     }
     await login();

package/dist/fixtures/commands/createUser.js

@@ -13,7 +13,7 @@ const getUserIdByUsername = async (request, userName, grafanaAPIUser) => {
     const json = await getUserIdByUserNameReq.json();
     return json.id;
 };
-const createUser = async ({ request, user, grafanaAPIUser }, use) => {
+const createUser = async ({ request, user, grafanaAPICredentials }, use) => {
     await use(async () => {
         if (!user) {
             throw new Error('Playwright option `User` was not provided');
@@ -24,7 +24,7 @@ const createUser = async ({ request, user, grafanaAPIUser }, use) => {
                 login: user?.user,
                 password: user?.password,
             },
-            headers: getHeaders(grafanaAPIUser),
+            headers: getHeaders(grafanaAPICredentials),
         });
         let userId;
         if (createUserReq.ok()) {
@@ -33,7 +33,7 @@ const createUser = async ({ request, user, grafanaAPIUser }, use) => {
         }
         else if (createUserReq.status() === 412) {
             // user already exists
-            userId = await getUserIdByUsername(request, user?.user, grafanaAPIUser);
+            userId = await getUserIdByUsername(request, user?.user, grafanaAPICredentials);
         }
         else {
             throw new Error(`Could not create user '${user?.user}': ${await createUserReq.text()}`);
@@ -41,7 +41,7 @@ const createUser = async ({ request, user, grafanaAPIUser }, use) => {
         if (user.role) {
             const updateRoleReq = await request.patch(`/api/org/users/${userId}`, {
                 data: { role: user.role },
-                headers: getHeaders(grafanaAPIUser),
+                headers: getHeaders(grafanaAPICredentials),
             });
             const updateRoleReqText = await updateRoleReq.text();
             (0, test_1.expect)(updateRoleReq.ok(), `Could not assign role '${user.role}' to user '${user.user}': ${updateRoleReqText}`).toBeTruthy();

package/dist/fixtures/commands/gotoDataSourceConfigPage.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gotoDataSourceConfigPage = void 0;
 const DataSourceConfigPage_1 = require("../../models/pages/DataSourceConfigPage");
-const gotoDataSourceConfigPage = async ({ request, page, selectors, grafanaVersion, grafanaAPIUser }, use, testInfo) => {
+const gotoDataSourceConfigPage = async ({ request, page, selectors, grafanaVersion, grafanaAPICredentials }, use, testInfo) => {
     await use(async (uid) => {
         const response = await request.get(`/api/datasources/uid/${uid}`, {
             headers: {
-                // here we call backend as admin user and not on behalf of the logged in user as it might not have required permissions
-                Authorization: `Basic ${Buffer.from(`${grafanaAPIUser.user}:${grafanaAPIUser.password}`).toString('base64')}`,
+                Authorization: `Basic ${Buffer.from(`${grafanaAPICredentials.user}:${grafanaAPICredentials.password}`).toString('base64')}`,
             },
         });
         if (!response.ok()) {

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

@@ -1,6 +1,5 @@
 import { TestFixture } from '@playwright/test';
-import { PlaywrightArgs, User } from '../../types';
+import { PlaywrightArgs } from '../../types';
 type LoginFixture = TestFixture<() => Promise<void>, PlaywrightArgs>;
-export declare const DEFAULT_ADMIN_USER: User;
 export declare const login: LoginFixture;
 export {};

package/dist/fixtures/commands/login.js

@@ -3,17 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.login = exports.DEFAULT_ADMIN_USER = void 0;
+exports.login = void 0;
 const path_1 = __importDefault(require("path"));
 const test_1 = require("@playwright/test");
-exports.DEFAULT_ADMIN_USER = { user: 'admin', password: 'admin' };
 const login = async ({ request, user }, use) => {
     await use(async () => {
-        const data = user ?? exports.DEFAULT_ADMIN_USER;
-        const loginReq = await request.post('/login', { data });
+        const loginReq = await request.post('/login', { data: user });
         const text = await loginReq.text();
         test_1.expect.soft(loginReq.ok(), `Could not log in to Grafana: ${text}`).toBeTruthy();
-        await request.storageState({ path: path_1.default.join(process.cwd(), `playwright/.auth/${data.user}.json`) });
+        await request.storageState({ path: path_1.default.join(process.cwd(), `playwright/.auth/${user?.user}.json`) });
     });
 };
 exports.login = login;

package/dist/options.d.ts

@@ -1,3 +1,4 @@
 import { Fixtures } from '@playwright/test';
-import { PluginOptions } from './types';
+import { PluginOptions, User } from './types';
+export declare const DEFAULT_ADMIN_USER: User;
 export declare const options: Fixtures<{}, PluginOptions>;

package/dist/options.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = void 0;
+exports.options = exports.DEFAULT_ADMIN_USER = void 0;
 const path = require("path");
-const login_1 = require("./fixtures/commands/login");
+exports.DEFAULT_ADMIN_USER = { user: 'admin', password: 'admin' };
 exports.options = {
-    user: [undefined, { option: true, scope: 'worker' }],
     featureToggles: [{}, { option: true, scope: 'worker' }],
     provisioningRootDir: [path.join(process.cwd(), 'provisioning'), { option: true, scope: 'worker' }],
-    grafanaAPIUser: [login_1.DEFAULT_ADMIN_USER, { option: true, scope: 'worker' }],
+    user: [exports.DEFAULT_ADMIN_USER, { option: true, scope: 'worker' }],
+    grafanaAPICredentials: [exports.DEFAULT_ADMIN_USER, { option: true, scope: 'worker' }],
 };

package/dist/types.d.ts

@@ -51,12 +51,12 @@ export type PluginOptions = {
      * You can use different users for different projects. See the fixture createUser for more information on how to create a user,
      * and the fixture login for more information on how to authenticate. Also see https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/use-authentication
      */
-    user?: UserArgs;
+    user?: User;
     /**
-     * The user to use when making requests to the Grafana API. For example when creating users, fetching data sources etc.
-     * If no user is provided, the server default admin/admin user will be used.
+     * The credentials to use when making requests to the Grafana API. For example when creating users, fetching data sources etc.
+     * If no credentials are provided, the server default admin:admin credentials will be used.
      */
-    grafanaAPIUser: User;
+    grafanaAPICredentials: Credentials;
 };
 export type PluginFixture = {
     /**
@@ -265,32 +265,19 @@ export interface Dashboard {
     uid: string;
     title?: string;
 }
-export type UserArgs = {
+export type User = {
     /**
-     * The username of the user to create. Needs to be unique
+     * The username of the user
      */
     user: string;
-    /**
-     * The password of the user to create
-     */
     password: string;
-    /**
-     * The role of the user to create
-     */
     role?: OrgRole;
-    /**
-     * Set this to true if the user already exist in the database. If omitted or set to false, the user will be created.
-     */
-    skipCreateUser?: boolean;
 };
-export type User = {
+export type Credentials = {
     /**
      * The username of the user
      */
     user: string;
-    /**
-     * The passwords
-     */
     password: string;
 };
 export type CreateDataSourceArgs<T = any> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.3.0-canary.930.bdc666d.0",
+  "version": "1.3.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -55,5 +55,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "bdc666deaf58d5fe071a6029b63272a33ccd4f7d"
+  "gitHead": "07e8e88ac5f4a64474a011620c9b2e740ce7b64c"
 }