Add carriers for version 1.7.7

.gitignore

@@ -3,3 +3,4 @@
 
 ## IDE
 /.vscode/
+/.idea/

src/pages/BO/BOBasePage.ts

@@ -85,7 +85,7 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte
 
   private readonly dashboardLink: string;
 
-  public readonly ordersParentLink: string;
+  public ordersParentLink: string;
 
   public readonly ordersLink: string;
 
@@ -115,7 +115,7 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte
 
   public readonly stocksLink: string;
 
-  public readonly customersParentLink: string;
+  public customersParentLink: string;
 
   public readonly customersLink: string;
 
@@ -155,11 +155,11 @@ export default class BOBasePage extends CommonPage implements BOBasePagePageInte
 
   public readonly linkWidgetLink: string;
 
-  public readonly shippingLink: string;
+  public shippingLink: string;
 
-  public readonly carriersLink: string;
+  public carriersLink: string;
 
-  public readonly shippingPreferencesLink: string;
+  public shippingPreferencesLink: string;
 
   public readonly paymentParentLink: string;
 

src/pages/BO/customers/addresses/create.ts

@@ -1,8 +1,21 @@
 import {type BOAddressesCreatePageInterface} from '@interfaces/BO/customers/addresses/create';
+import testContext from '@utils/test';
+import semver from 'semver';
+
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOAddressesCreatePageInterface {
-  return require('@versions/develop/pages/BO/customers/addresses/create');
+  if (semver.lt(psVersion, '7.0.0')) {
+    return require('@versions/1.6.1/pages/BO/customers/addresses/create').boAddressesCreatePage;
+  }
+  if (semver.lt(psVersion, '7.8.0')) {
+    return require('@versions/1.7.7/pages/BO/customers/addresses/create').boAddressesCreatePage;
+  }
+  if (semver.lt(psVersion, '9.0.0')) {
+    return require('@versions/8.2/pages/BO/customers/addresses/create').boAddressesCreatePage;
+  }
+  return require('@versions/develop/pages/BO/customers/addresses/create').boAddressesCreatePage;
 }
 /* eslint-enable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 

src/pages/BO/customers/addresses/index.ts

@@ -1,8 +1,24 @@
 import {type BOAddressesPageInterface} from '@interfaces/BO/customers/addresses';
+import testContext from '@utils/test';
+import semver from 'semver';
+
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOAddressesPageInterface {
-  return require('@versions/develop/pages/BO/customers/addresses');
+  if (semver.lt(psVersion, '7.0.0')) {
+    return require('@versions/1.6.1/pages/BO/customers/addresses').boAddressesPage;
+  }
+  if (semver.lt(psVersion, '7.8.0')) {
+    return require('@versions/1.7.7/pages/BO/customers/addresses').boAddressesPage;
+  }
+  if (semver.lt(psVersion, '8.0.0')) {
+    return require('@versions/1.7.8/pages/BO/customers/addresses').boAddressesPage;
+  }
+  if (semver.lt(psVersion, '9.0.0')) {
+    return require('@versions/8.2/pages/BO/customers/addresses').boAddressesPage;
+  }
+  return require('@versions/develop/pages/BO/customers/addresses').boAddressesPage;
 }
 /* eslint-enable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 

src/pages/BO/dashboard/index.ts

@@ -6,8 +6,11 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports */
 function requirePage(): DashboardPageInterface {
-  if (semver.gte(psVersion, '0.0.0')) {
-    return require('@versions/develop/pages/BO/dashboard');
+  if (semver.lt(psVersion, '7.0.0')) {
+    return require('@versions/1.6.1/pages/BO/dashboard').boDashboardPage;
+  }
+  if (semver.lt(psVersion, '9.0.0')) {
+    return require('@versions/develop/pages/BO/dashboard').boDashboardPage;
   }
   return require('@versions/develop/pages/BO/dashboard');
 }

src/pages/BO/login/index.ts

@@ -13,7 +13,7 @@ function requirePage(): LoginPageInterface {
     return require('@versions/1.7.8/pages/BO/login').loginPage;
   }
   if (semver.lt(psVersion, '9.0.0')) {
-    return require('@versions/8.1/pages/BO/login').loginPage;
+    return require('@versions/develop/pages/BO/login').loginPage;
   }
   return require('@versions/develop/pages/BO/login').loginPage;
 }

src/pages/BO/orders/create.ts

@@ -1,7 +1,23 @@
 import type {BOOrdersCreatePageInterface} from '@interfaces/BO/orders/create';
+import testContext from '@utils/test';
+import semver from 'semver';
+
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOOrdersCreatePageInterface {
+  if (semver.lt(psVersion, '7.0.0')) {
+    return require('@versions/1.6.1/pages/BO/orders/create').boOrderCreatePage;
+  }
+  if (semver.lt(psVersion, '7.8.0')) {
+    return require('@versions/1.7.7/pages/BO/orders/create').boOrderCreatePage;
+  }
+  if (semver.lt(psVersion, '8.0.0')) {
+    return require('@versions/1.7.8/pages/BO/orders/create').boOrderCreatePage;
+  }
+  if (semver.lt(psVersion, '9.0.0')) {
+    return require('@versions/8.2/pages/BO/orders/create').boOrderCreatePage;
+  }
   return require('@versions/develop/pages/BO/orders/create');
 }
 

src/pages/BO/orders/index.ts

@@ -6,6 +6,9 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOOrdersPageInterface {
+  if (semver.lt(psVersion, '7.0.0')) {
+    return require('@versions/1.6.1/pages/BO/orders').ordersPage;
+  }
   if (semver.lt(psVersion, '7.3.0')) {
     return require('@versions/1.7.2/pages/BO/orders').ordersPage;
   }

src/pages/BO/shipping/carriers/create.ts

@@ -7,7 +7,7 @@ const psVersion = testContext.getPSVersion();
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOCarriersCreatePageInterface {
   if (semver.lt(psVersion, '9.0.0')) {
-    return require('@versions/8.2/pages/BO/shipping/carriers/create');
+    return require('@versions/8.2/pages/BO/shipping/carriers/create').boCarriersCreatePage;
   }
   return require('@versions/develop/pages/BO/shipping/carriers/create').boCarriersCreatePage;
 }

src/pages/BO/shipping/carriers/index.ts

@@ -6,8 +6,17 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOCarriersPageInterface {
+  if (semver.lt(psVersion, '7.0.0')) {
+    return require('@versions/1.6.1/pages/BO/shipping/carriers').boCarriersPage;
+  }
+  if (semver.lt(psVersion, '7.8.0')) {
+    return require('@versions/1.7.7/pages/BO/shipping/carriers').boCarriersPage;
+  }
+  if (semver.lt(psVersion, '8.0.0')) {
+    return require('@versions/1.7.8/pages/BO/shipping/carriers').boCarriersPage;
+  }
   if (semver.lt(psVersion, '9.0.0')) {
-    return require('@versions/8.2/pages/BO/shipping/carriers');
+    return require('@versions/8.2/pages/BO/shipping/carriers').boCarriersPage;
   }
   return require('@versions/develop/pages/BO/shipping/carriers').boCarriersPage;
 }

src/utils/test.ts

@@ -50,7 +50,8 @@ export default {
     const version: string = process.env.PS_VERSION;
 
     return version
-      .replace(/\.x$/, '.99')
-      .replace(/^1\.7\./, '7.');
+        .replace(/\.x$/, '.99')
+        .replace(/^1\.7\./, '7.')
+        .replace(/^1\.6\./, '6.');
   },
 };

src/versions/1.6.1/pages/BO/customers/addresses/create.ts

@@ -0,0 +1,115 @@
+// Import pages
+import type FakerAddress from '@data/faker/address';
+import {BOAddressesCreatePageInterface} from '@interfaces/BO/customers/addresses/create';
+import type {Frame, Page} from '@playwright/test';
+import {BOAddressesCreatePage as BOAddressCreatePageVersion} from '@versions/1.7.7/pages/BO/customers/addresses/create';
+
+class BOAddressesCreatePage extends BOAddressCreatePageVersion implements BOAddressesCreatePageInterface {
+  private readonly customerAddressMobilePhoneInput: string;
+  /**
+     * @constructs
+     * Setting up texts and selectors to use in addresses create page
+     */
+  constructor() {
+    super();
+    // Title
+    this.pageTitleCreate = `Addresses > Add new • ${global.INSTALL.SHOP_NAME}`;
+    // Alert Text
+    this.alertBlock = 'div.alert';
+    this.alertTextBlock = `${this.alertBlock}`;
+    this.alertBlockCloseButton = `${this.alertBlock} button[aria-label='Close']`;
+    this.alertSuccessBlock = `${this.alertBlock}.alert-success`;
+    this.alertSuccessBlockParagraph = `${this.alertSuccessBlock}`;
+    // Selectors
+    this.customerEmailInput = '#email';
+    this.customerAddressdniInput = '#dni';
+    this.customerAddressAliasInput = '#alias';
+    this.customerAddressFirstNameInput = '#firstname';
+    this.customerLastNameInput = '#lastname';
+    this.customerAddressCompanyInput = '#company';
+    this.customerAddressVatNumberInput = '#vat_number';
+    this.customerAddressInput = '#address1';
+    this.customerAddressPostCodeInput = '#postcode';
+    this.customerSecondAddressInput = '#address2';
+    this.customerAddressCityInput = '#city';
+    this.customerAddressCountrySelect = '#id_country';
+    this.customerAddressPhoneInput = '#phone';
+    this.customerAddressMobilePhoneInput = '#phone_mobile';
+    this.customerAddressOtherInput = '#other';
+    this.saveAddressButton = '#address_form_submit_btn';
+  }
+
+  /**
+   * Fill form for add/edit address
+   * @param page {Frame|Page} Browser tab
+   * @param addressData {FakerAddress} Data to set on new address form
+   * @param save {boolean} True if we need to save the new address, false if not
+   * @param waitForNavigation {boolean} True if we need to wait for navigation after save, false if not
+   * @returns {Promise<?string>}
+   */
+  async createEditAddress(
+      page: Frame|Page,
+      addressData: FakerAddress,
+      save: boolean = true,
+      waitForNavigation: boolean = true,
+  ): Promise<string|null> {
+    if (await this.elementVisible(page, this.customerEmailInput, 2000)) {
+      await this.setValue(page, this.customerEmailInput, addressData.email);
+    }
+    await this.setValue(page, this.customerAddressdniInput, addressData.dni);
+    await this.setValue(page, this.customerAddressAliasInput, addressData.alias);
+    await this.setValue(page, this.customerAddressFirstNameInput, addressData.firstName);
+    await this.setValue(page, this.customerLastNameInput, addressData.lastName);
+    await this.setValue(page, this.customerAddressCompanyInput, addressData.company);
+    await this.setValue(page, this.customerAddressVatNumberInput, addressData.vatNumber);
+    await this.setValue(page, this.customerAddressInput, addressData.address);
+    await this.setValue(page, this.customerSecondAddressInput, addressData.secondAddress);
+    await this.setValue(page, this.customerAddressPostCodeInput, addressData.postalCode);
+    await this.setValue(page, this.customerAddressCityInput, addressData.city);
+    await this.selectByVisibleText(page, this.customerAddressCountrySelect, addressData.country);
+    await this.setValue(page, this.customerAddressPhoneInput, addressData.phone);
+    await this.setValue(page, this.customerAddressMobilePhoneInput, addressData.phone);
+    await this.setValue(page, this.customerAddressOtherInput, addressData.other);
+
+    if (await this.elementVisible(page, this.customerAddressStateSelect, 1000)) {
+      await page.locator(this.customerAddressStateSelect).click();
+      await this.setValue(page, this.searchStateInput, addressData.state);
+      await this.waitForSelectorAndClick(page, this.searchResultState);
+    }
+
+    // Save and return successful message
+    if (save) {
+      if (waitForNavigation) {
+        return this.saveAddress(page);
+      }
+
+      await page.locator(this.saveAddressButton).click();
+    }
+
+    return null;
+  }
+
+  /**
+   * Save address
+   * @param page {Frame|Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async saveAddress(page: Frame|Page): Promise<string> {
+    await this.clickAndWaitForURL(page, this.saveAddressButton);
+    return this.getAlertSuccessBlockParagraphContent(page);
+  }
+
+  /**
+   * Get text content of alert success block paragraph
+   * @param page {Frame|Page} Browser tab
+   * @param timeout
+   * @return {Promise<string>}
+   */
+  async getAlertSuccessBlockParagraphContent(page: Frame | Page, timeout: number = 2000): Promise<string> {
+    await this.elementVisible(page, this.alertSuccessBlockParagraph, timeout);
+    return this.getTextContent(page, this.alertSuccessBlockParagraph);
+  }
+}
+
+const boAddressesCreatePage = new BOAddressesCreatePage();
+export {boAddressesCreatePage, BOAddressesCreatePage};

src/versions/1.6.1/pages/BO/customers/addresses/index.ts

@@ -0,0 +1,24 @@
+import {type BOAddressesPageInterface} from '@interfaces/BO/customers/addresses';
+import {BOAddressesPage as BOAddressesPageVersion} from '@versions/1.7.7/pages/BO/customers/addresses';
+
+/**
+ * Addresses page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class BOAddressesPage extends BOAddressesPageVersion implements BOAddressesPageInterface {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on addresses page
+   */
+  constructor() {
+    super();
+    this.successfulCreationMessage = '× Successful creation';
+    this.pageTitle = `Addresses • ${global.INSTALL.SHOP_NAME}`;
+    // Header links
+    this.addNewAddressLink = '#page-header-desc-address-new_address';
+  }
+}
+
+const boAddressesPage = new BOAddressesPage();
+export {boAddressesPage, BOAddressesPage};

src/versions/1.6.1/pages/BO/dashboard/index.ts

@@ -0,0 +1,26 @@
+import type {DashboardPageInterface} from '@interfaces/BO/dashboard';
+import {Dashboard as DashboardPageVersion} from '@versions/develop/pages/BO/dashboard';
+
+/**
+ * Bo dashboard page, contains functions that can be used on the page
+ * @class
+ * @extends DashboardPage
+ */
+class DashboardPage extends DashboardPageVersion implements DashboardPageInterface {
+  /**
+   * @constructs
+   * Setting up titles and selectors to use on dashboard page
+   */
+  constructor() {
+    super();
+    // Orders
+    this.ordersParentLink = 'li#maintab-AdminParentOrders';
+    // Customers
+    this.customersParentLink = 'li#maintab-AdminParentCustomer';
+    // Shipping
+    this.shippingLink = '#maintab-AdminParentShipping';
+  }
+}
+
+const boDashboardPage = new DashboardPage();
+export {boDashboardPage, DashboardPage};

src/versions/1.6.1/pages/BO/login/index.ts

@@ -0,0 +1,20 @@
+// Import pages
+import type {LoginPageInterface} from '@interfaces/BO/login';
+import {LoginPage} from '@versions/1.7.2/pages/BO/login';
+
+/**
+ * Bo login page, contains functions that can be used on the page
+ * @class
+ * @extends ProductsPage
+ */
+class BOLoginVersion extends LoginPage implements LoginPageInterface {
+  /**
+     * @constructs
+     * Setting up texts and selectors to use on login page
+     */
+  constructor() {
+    super();
+  }
+}
+
+module.exports = new BOLoginVersion();