@umbraco/playwright-testhelpers 17.1.0-beta.5 → 17.1.0-beta.7

package/dist/lib/helpers/CurrentUserProfileUiHelper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurrentUserProfileUiHelper = void 0;
+const test_1 = require("@playwright/test");
 const UiBaseLocators_1 = require("./UiBaseLocators");
 class CurrentUserProfileUiHelper extends UiBaseLocators_1.UiBaseLocators {
     changePasswordBtn;
@@ -9,12 +10,17 @@ class CurrentUserProfileUiHelper extends UiBaseLocators_1.UiBaseLocators {
         this.changePasswordBtn = page.getByLabel('Change password');
     }
     async clickChangePasswordButton() {
-        await this.click(this.changePasswordBtn);
+        await (0, test_1.expect)(this.changePasswordBtn).toBeVisible();
+        await this.changePasswordBtn.click();
     }
     async changePassword(currentPassword, newPassword) {
-        await this.enterText(this.currentPasswordTxt, currentPassword);
-        await this.enterText(this.newPasswordTxt, newPassword);
-        await this.enterText(this.confirmPasswordTxt, newPassword);
+        await (0, test_1.expect)(this.currentPasswordTxt).toBeVisible();
+        await this.currentPasswordTxt.clear();
+        await this.currentPasswordTxt.fill(currentPassword);
+        await this.newPasswordTxt.clear();
+        await this.newPasswordTxt.fill(newPassword);
+        await this.confirmPasswordTxt.clear();
+        await this.confirmPasswordTxt.fill(newPassword);
         await this.clickConfirmButton();
     }
 }

package/dist/lib/helpers/CurrentUserProfileUiHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"CurrentUserProfileUiHelper.js","sourceRoot":"","sources":["../../../lib/helpers/CurrentUserProfileUiHelper.ts"],"names":[],"mappings":";;;AACA,qDAAgD;AAEhD,MAAa,0BAA2B,SAAQ,+BAAc;IAC3C,iBAAiB,CAAU;IAE5C,YAAY,IAAU;QACpB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC7B,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,eAAuB,EAAE,WAAmB;QAC/D,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;CACF;AAlBD,gEAkBC","sourcesContent":["import {Locator, Page} from \"@playwright/test\"\nimport {UiBaseLocators} from \"./UiBaseLocators\";\n\nexport class CurrentUserProfileUiHelper extends UiBaseLocators {\n  private readonly changePasswordBtn: Locator;\n\n  constructor(page: Page) {\n    super(page);\n    this.changePasswordBtn = page.getByLabel('Change password');\n  }\n\n  async clickChangePasswordButton() {\n    await this.click(this.changePasswordBtn);\n  }\n\n  async changePassword(currentPassword: string, newPassword: string) {\n    await this.enterText(this.currentPasswordTxt, currentPassword);\n    await this.enterText(this.newPasswordTxt, newPassword);\n    await this.enterText(this.confirmPasswordTxt, newPassword);\n    await this.clickConfirmButton();\n  }\n}"]}
+{"version":3,"file":"CurrentUserProfileUiHelper.js","sourceRoot":"","sources":["../../../lib/helpers/CurrentUserProfileUiHelper.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AACtD,qDAAgD;AAEhD,MAAa,0BAA2B,SAAQ,+BAAc;IAC3C,iBAAiB,CAAU;IAE5C,YAAY,IAAU;QACpB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC7B,MAAM,IAAA,aAAM,EAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,eAAuB,EAAE,WAAmB;QAC/D,MAAM,IAAA,aAAM,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,WAAW,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;CACF;AAvBD,gEAuBC","sourcesContent":["import {expect, Locator, Page} from \"@playwright/test\"\nimport {UiBaseLocators} from \"./UiBaseLocators\";\n\nexport class CurrentUserProfileUiHelper extends UiBaseLocators {\n  private readonly changePasswordBtn: Locator;\n\n  constructor(page: Page) {\n    super(page);\n    this.changePasswordBtn = page.getByLabel('Change password');\n  }\n\n  async clickChangePasswordButton() {\n    await expect(this.changePasswordBtn).toBeVisible();\n    await this.changePasswordBtn.click();\n  }\n\n  async changePassword(currentPassword: string, newPassword: string) {\n    await expect(this.currentPasswordTxt).toBeVisible();\n    await this.currentPasswordTxt.clear();\n    await this.currentPasswordTxt.fill(currentPassword);\n    await this.newPasswordTxt.clear();\n    await this.newPasswordTxt.fill(newPassword);\n    await this.confirmPasswordTxt.clear();\n    await this.confirmPasswordTxt.fill(newPassword);\n    await this.clickConfirmButton();\n  }\n}"]}

package/dist/lib/helpers/DataTypeApiHelper.d.ts

@@ -1,30 +1,18 @@
-import { ApiHelpers } from "./ApiHelpers";
-export declare class DataTypeApiHelper {
-    api: ApiHelpers;
-    constructor(api: ApiHelpers);
-    get(id: string): Promise<any>;
-    create(name: string, editorAlias: string, editorUiAlias: string, values: {
+import { TreeApiHelper } from "./TreeApiHelper";
+export declare class DataTypeApiHelper extends TreeApiHelper {
+    protected resourcePath: string;
+    protected treePath: string;
+    getByName(name: string): Promise<any>;
+    createDataType(name: string, editorAlias: string, editorUiAlias: string, values: {
         alias: string;
         value: string;
     }[], parentId?: string, id?: string): Promise<string | undefined>;
-    update(id: string, dataType: any): Promise<import("playwright-core").APIResponse>;
-    delete(id: string): Promise<import("playwright-core").APIResponse>;
-    getAllAtRoot(): Promise<import("playwright-core").APIResponse>;
-    doesExist(id: string): Promise<boolean>;
+    update(id: string, dataType: any): Promise<any>;
     getItems(ids: string[]): Promise<any>;
-    getByName(name: string): Promise<any>;
-    ensureNameNotExists(name: string): Promise<import("playwright-core").APIResponse | null>;
-    doesNameExist(name: string): Promise<any>;
     moveToFolder(dataTypeId: string, folderId: string): Promise<import("playwright-core").APIResponse>;
     copyToFolder(dataTypeId: string, folderId: string): Promise<string | undefined>;
-    getFolder(id: string): Promise<any>;
-    createFolder(name: string, parentId?: string, id?: string): Promise<string | undefined>;
-    renameFolder(id: string, name: string): Promise<import("playwright-core").APIResponse>;
-    deleteFolder(id: string): Promise<import("playwright-core").APIResponse>;
+    createFolder(name: string, parentId?: string, id?: string): Promise<string>;
     doesFolderExist(id: string): Promise<boolean>;
-    getChildren(id: string): Promise<any>;
-    private recurseDeleteChildren;
-    private recurseChildren;
     save(dataType: any): Promise<string | undefined>;
     createDefaultDateTimeDataType(name: string): Promise<string | undefined>;
     createCheckboxListDataType(name: string, options?: string[]): Promise<string | undefined>;
@@ -116,7 +104,7 @@ export declare class DataTypeApiHelper {
     createListViewContentDataType(name?: string): Promise<string | undefined>;
     createListViewContentDataTypeWithLayoutAndPageSize(name?: string, layoutAlias?: string, layoutName?: string, pageSize?: number): Promise<string | undefined>;
     createListViewContentDataTypeWithAllPermissions(name?: string): Promise<string | undefined>;
-    updateListViewMediaDataType(alias: string, newValue: any): Promise<import("playwright-core").APIResponse>;
+    updateListViewMediaDataType(alias: string, newValue: any): Promise<any>;
     createDefaultTiptapDataType(name: string): Promise<string | undefined>;
     createTipTapDataTypeWithABlock(name: string, contentElementTypeKey: string): Promise<string | undefined>;
     createApprovedColorDataTypeWithOneItem(name: string, itemLabel: string, itemValue: string): Promise<string | undefined>;

package/dist/lib/helpers/DataTypeApiHelper.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataTypeApiHelper = void 0;
+const TreeApiHelper_1 = require("./TreeApiHelper");
 const json_models_builders_1 = require("@umbraco/json-models-builders");
-class DataTypeApiHelper {
-    api;
-    constructor(api) {
-        this.api = api;
-    }
-    async get(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-        return await response.json();
+class DataTypeApiHelper extends TreeApiHelper_1.TreeApiHelper {
+    resourcePath = 'data-type';
+    treePath = 'tree/data-type';
+    // Override to handle isContainer check specific to DataType
+    async getByName(name) {
+        const rootItems = await this.getAllAtRoot();
+        const jsonItems = await rootItems.json();
+        for (const item of jsonItems.items) {
+            if (item.name === name) {
+                return item.isFolder ? this.getFolder(item.id) : this.get(item.id);
+            }
+            else if (item.isContainer || item.hasChildren) {
+                const result = await this.recurseChildren(name, item.id, false);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return false;
     }
-    async create(name, editorAlias, editorUiAlias, values, parentId, id) {
+    // DataType-specific create method with different signature
+    async createDataType(name, editorAlias, editorUiAlias, values, parentId, id) {
         const dataType = {
             "name": name,
             "editorAlias": editorAlias,
@@ -20,8 +33,7 @@ class DataTypeApiHelper {
             "id": id,
             "parent": parentId ? { "id": parentId } : null
         };
-        const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type', dataType);
-        // Returns the id of the created dataType
+        const response = await this.api.post(this.buildUrl(), dataType);
         return response.headers().location.split("v1/data-type/").pop();
     }
     async update(id, dataType) {
@@ -31,150 +43,45 @@ class DataTypeApiHelper {
             "editorUiAlias": dataType.editorUiAlias,
             "values": dataType.values,
         };
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id, updateDataType);
-    }
-    async delete(id) {
-        return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-    }
-    async getAllAtRoot() {
-        return await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-    }
-    async doesExist(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-        return response.status() === 200;
+        return await this.api.put(this.buildUrl('/' + id), updateDataType);
     }
     async getItems(ids) {
         let idArray = 'id=' + ids[0];
-        let i;
-        for (i = 1; i < ids.length; ++i) {
+        for (let i = 1; i < ids.length; ++i) {
             idArray += '&id=' + ids[i];
         }
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/item?' + idArray);
+        const response = await this.api.get(`${this.api.baseUrl}/umbraco/management/api/v1/${this.treePath}/item?${idArray}`);
         return await response.json();
     }
-    async getByName(name) {
-        const rootDataTypes = await this.getAllAtRoot();
-        const jsonDataTypes = await rootDataTypes.json();
-        for (const dataType of jsonDataTypes.items) {
-            if (dataType.name === name) {
-                return this.get(dataType.id);
-            }
-            else if (dataType.isContainer || dataType.hasChildren) {
-                const result = await this.recurseChildren(name, dataType.id, false);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return false;
-    }
-    async ensureNameNotExists(name) {
-        const rootDataTypes = await this.getAllAtRoot();
-        const jsonDataTypes = await rootDataTypes.json();
-        for (const dataType of jsonDataTypes.items) {
-            if (dataType.name === name) {
-                if (dataType.isFolder) {
-                    return await this.recurseDeleteChildren(dataType);
-                }
-                return await this.delete(dataType.id);
-            }
-            else if (dataType.hasChildren) {
-                await this.recurseChildren(name, dataType.id, true);
-            }
-        }
-        return null;
-    }
-    async doesNameExist(name) {
-        return await this.getByName(name);
-    }
     async moveToFolder(dataTypeId, folderId) {
         const folderIdBody = {
             "target": { id: folderId }
         };
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/move', folderIdBody);
+        return await this.api.put(this.buildUrl('/' + dataTypeId + '/move'), folderIdBody);
     }
     async copyToFolder(dataTypeId, folderId) {
         const folderIdBody = {
             "target": { id: folderId }
         };
-        const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/copy', folderIdBody);
-        // Returns the id of the copied dataType
+        const response = await this.api.post(this.buildUrl('/' + dataTypeId + '/copy'), folderIdBody);
         return response.headers().location.split("v1/data-type/").pop();
     }
-    // FOLDER
-    async getFolder(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
-        return await response.json();
-    }
+    // Override createFolder to support optional id parameter
     async createFolder(name, parentId, id) {
         const folderData = {
             "name": name,
             "id": id,
             "parent": parentId ? { "id": parentId } : null
         };
-        const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder', folderData);
-        // Returns the id of the created dataTypeFolder
+        const response = await this.api.post(this.buildUrl('/folder'), folderData);
         return response.headers().location.split("v1/data-type/folder/").pop();
     }
-    async renameFolder(id, name) {
-        const folderData = {
-            "name": name,
-        };
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id, folderData);
-    }
-    async deleteFolder(id) {
-        return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
-    }
     async doesFolderExist(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
+        const response = await this.api.get(this.buildUrl('/folder/' + id));
         return response.status() === 200;
     }
-    async getChildren(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/children?parentId=' + id + '&skip=0&take=100&foldersOnly=false');
-        const items = await response.json();
-        return items.items;
-    }
-    async recurseDeleteChildren(dataFolder) {
-        if (!dataFolder.hasChildren) {
-            return await this.deleteFolder(dataFolder.id);
-        }
-        const items = await this.getChildren(dataFolder.id);
-        for (const child of items) {
-            if (child.hasChildren) {
-                await this.recurseDeleteChildren(child);
-            }
-            else if (child.isFolder) {
-                await this.deleteFolder(child.id);
-            }
-            else {
-                await this.delete(child.id);
-            }
-        }
-        return await this.deleteFolder(dataFolder.id);
-    }
-    async recurseChildren(name, id, toDelete) {
-        const items = await this.getChildren(id);
-        for (const child of items) {
-            if (child.name === name) {
-                if (!toDelete) {
-                    if (child.isFolder) {
-                        return await this.getFolder(child.id);
-                    }
-                    return await this.get(child.id);
-                }
-                if (child.isFolder) {
-                    return await this.recurseDeleteChildren(child);
-                }
-                return await this.delete(child.id);
-            }
-            else if (child.hasChildren) {
-                return await this.recurseChildren(name, child.id, toDelete);
-            }
-        }
-        return false;
-    }
     async save(dataType) {
-        const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type', dataType);
+        const response = await this.api.post(this.buildUrl(), dataType);
         return response.headers().location.split("v1/data-type/").pop();
     }
     async createDefaultDateTimeDataType(name) {