HP-1357 HiAPI hdomain module rewrite

Author: gadezist

src/widgets/ip/HdomainIpCombo.php

@@ -58,7 +58,7 @@ function (data) {
                             var ret = [];
                             var used_ips = {};
                             $.each(data, function (i, v) {
-                                $.each(v.expanded_ips, function (ip, ipval) {
+                                $.each(v.expanded_ips, function (key, ip) {
                                     if (used_ips[ip]) return;
 
                                     var row = {id: ip};

tests/playwright/e2e/admin/hdomain/hdomain-create.spec.ts

@@ -0,0 +1,26 @@
+import { test } from "@hipanel-core/fixtures";
+import { expect } from "@playwright/test";
+import HDomainHelper from "@hipanel-module-hosting/helper/HDomainHelper";
+import HDomain from "@hipanel-module-hosting/model/HDomain";
+import HDomainForm from "@hipanel-module-hosting/page/HDomainForm";
+
+const domain: HDomain = {
+  client: "hipanel_test_reseller",
+  server: "DSTEST02",
+  account: "hipanel_test_account",
+  domainName: "test.hiqdev",
+  ip: "apache22: 223.112.1.13",
+}
+
+test("Create domain @hipanel-module-hosting @admin", async ({ adminPage }) => {
+
+  const hdomainHelper = new HDomainHelper(adminPage);
+  const hdomainForm = new HDomainForm(adminPage);
+
+  await hdomainHelper.gotoIndexDomain();
+  await hdomainHelper.gotoCreateDomain();
+
+  await hdomainForm.fill(domain);
+  await hdomainForm.save();
+  await hdomainForm.seeSuccessAccountCreatingAlert();
+});

tests/playwright/e2e/admin/hdomain/hdomain-eblock.spec.ts

@@ -0,0 +1,38 @@
+import { test } from "@hipanel-core/fixtures";
+import { expect } from "@playwright/test";
+import Index from "@hipanel-core/page/Index";
+import HDomainHelper from "@hipanel-module-hosting/helper/HDomainHelper";
+
+const domain: string = 'test.hiqdev';
+
+test.describe("Test domain block @hipanel-module-hosting @admin", () => {
+
+  let hdomainHelper: HDomainHelper;
+  let index: Index;
+
+  test.beforeEach(async ({ adminPage }) => {
+    hdomainHelper = new HDomainHelper(adminPage);
+    index = new Index(adminPage);
+
+    await hdomainHelper.gotoIndexDomain();
+    const rowNumber = await index.getRowNumberInColumnByValue("Domain name", domain);
+    await index.chooseNumberRowOnTable(rowNumber);
+  });
+
+  test("Enable domain block @hipanel-module-hosting @admin", async ({ managerPage }) => {
+
+    await index.clickDropdownBulkButton('Block', 'Enable');
+    await hdomainHelper.confirmEnableBlock();
+
+    await hdomainHelper.seeHdomainStatus(domain, 'Blocked');
+  });
+
+  test("Disable domain block @hipanel-module-hosting @admin", async ({ managerPage }) => {
+
+    await index.clickDropdownBulkButton('Block', 'Disable');
+    await hdomainHelper.confirmDisableBlock();
+
+    await hdomainHelper.seeHdomainStatus(domain, 'Ok');
+  });
+});
+

tests/playwright/e2e/admin/hdomain/hdomain-eview.spec.ts

@@ -0,0 +1,23 @@
+import { test } from "@hipanel-core/fixtures";
+import { expect } from "@playwright/test";
+import Index from "@hipanel-core/page/Index";
+import HDomainHelper from "@hipanel-module-hosting/helper/HDomainHelper";
+
+const domain: string = "test.hiqdev"
+const domainView: object = {
+  client: 'hipanel_test_reseller',
+  reseller: 'reseller',
+  account: 'hipanel_test_account',
+  server: 'DSTEST02',
+}
+
+test("Domain view correct @hipanel-module-hosting @admin", async ({ adminPage }) => {
+
+  const hdomainHelper = new HDomainHelper(adminPage);
+  const index = new Index(adminPage);
+
+  await hdomainHelper.gotoIndexDomain();
+  await hdomainHelper.gotoDomainPage(domain);
+
+  await hdomainHelper.checkDetailViewData(domainView);
+});

tests/playwright/e2e/admin/hdomain/hdomain-hdelete.spec.ts

@@ -0,0 +1,21 @@
+import { test } from "@hipanel-core/fixtures";
+import { expect } from "@playwright/test";
+import Index from "@hipanel-core/page/Index";
+import HDomainHelper from "@hipanel-module-hosting/helper/HDomainHelper";
+
+const domain: string = "test.hiqdev"
+// const domain: string = "ffff.ua"
+
+test("Delete domain @hipanel-module-hosting @admin", async ({ adminPage }) => {
+
+  const hdomainHelper = new HDomainHelper(adminPage);
+  const index = new Index(adminPage);
+
+  await hdomainHelper.gotoIndexDomain();
+
+  const rowNumber = await index.getRowNumberInColumnByValue("Domain name", domain);
+  await index.chooseNumberRowOnTable(rowNumber);
+
+  await hdomainHelper.delete();
+  await expect(await adminPage.locator(`text=${domain}`)).not.toBeVisible();
+});

tests/playwright/helper/HDomainHelper.ts

@@ -0,0 +1,63 @@
+import { expect, Locator, Page } from "@playwright/test";
+import Input from "@hipanel-core/input/Input";
+import Index from "@hipanel-core/page/Index";
+import Alert from "@hipanel-core/ui/Alert";
+
+export default class HDomainHelper {
+    private page: Page;
+    private index: Index;
+
+    public constructor(page: Page) {
+        this.page = page;
+        this.index = new Index(page);
+    }
+
+    async gotoIndexDomain() {
+        await this.page.goto('/hosting/hdomain/index');
+        await expect(this.page).toHaveTitle("Domains");
+    }
+
+    async gotoCreateDomain() {
+        await this.page.locator('#dropdownMenu1').click();
+        await this.page.locator('text=Create domain >> nth=1').click();
+    }
+
+    async gotoDomainPage(domain: string) {
+        await this.index.clickLinkOnTable('Domain name', domain);
+    }
+
+    async checkDetailViewData(domainView: object) {
+        await expect(this.page.locator('//table[contains(@class, "detail-view")]//tbody/tr[1]/td')).toContainText(domainView['client']);
+        await expect(this.page.locator('//table[contains(@class, "detail-view")]//tbody/tr[2]/td')).toContainText(domainView['reseller']);
+        await expect(this.page.locator('//table[contains(@class, "detail-view")]//tbody/tr[3]/td')).toContainText(domainView['account']);
+        await expect(this.page.locator('//table[contains(@class, "detail-view")]//tbody/tr[4]/td')).toContainText(domainView['server']);
+    }
+
+    async confirmEnableBlock() {
+        await Input.field(this.page, 'input[name="comment"]').fill("Test enable comment");
+        await this.index.clickButton('Block');
+    }
+
+    async confirmDisableBlock() {
+        await Input.field(this.page, 'input[name="comment"]').fill("Test unblock comment");
+        await this.index.clickButton('Unblock');
+    }
+
+    async confirmDelete() {
+        await this.index.clickButton('Delete');
+    }
+
+    async seeHdomainStatus(domain: string, status: string) {
+        const rowNumber = await this.index.getRowNumberInColumnByValue('Domain name', domain);
+        const accountStatus = await this.index.seeTextOnTable('Status', rowNumber, status);
+    }
+
+    async delete() {
+        this.page.on('dialog', dialog => dialog.accept());
+        await this.index.clickBulkButton('Delete');
+    }
+
+    async seeSuccessAlert(message: string) {
+        await Alert.on(this.page).hasText(message);
+    }
+}

tests/playwright/model/HDomain.ts

@@ -0,0 +1,7 @@
+export default class HDomain {
+    public client: string;
+    public server: string;
+    public account: string;
+    public domainName: string;
+    public ip: string;
+}

tests/playwright/page/HDomainForm.ts

@@ -0,0 +1,29 @@
+import { expect, Locator, Page } from "@playwright/test";
+import Select2 from "@hipanel-core/input/Select2";
+import Alert from "@hipanel-core/ui/Alert";
+import Input from "@hipanel-core/input/Input";
+import HDomain from "@hipanel-module-hosting/model/HDomain";
+
+export default class HDomainForm {
+  private page: Page;
+
+  constructor(page: Page) {
+    this.page = page;
+  }
+
+  async fill(domain: HDomain) {
+    await Select2.field(this.page, `#hdomain-0-client`).setValue(domain.client);
+    await Select2.field(this.page, `#hdomain-0-server`).setValue(domain.server);
+    await Select2.field(this.page, '#hdomain-0-account').setValue(domain.account);
+    await Input.field(this.page, '#hdomain-0-domain').fill(domain.domainName);
+    await Select2.field(this.page, '#hdomain-0-ip').setValue(domain.ip);
+  }
+
+  async save() {
+    await this.page.locator("text=Save").click();
+  }
+
+  async seeSuccessAccountCreatingAlert() {
+    await Alert.on(this.page).hasText("Domain has been created successfully");
+  }
+}