Merge branch '236-setup-kan-falen-door-gebruik-van-generieke-selector-div-message-in-magento-admin' into 'main'

Shay · Shay · commit b2cacafca671 · 2025-10-15T11:28:35.000+02:00
Resolve "Setup kan falen door gebruik van generieke selector 'div.message' in Magento admin"

See merge request elgentos/magento2-playwright!40
diff --git a/tests/config/element-identifiers.json b/tests/config/element-identifiers.json
@@ -183,6 +183,7 @@
     "homePageTitleText": "Hyvä Themes"
   },
   "magentoAdminPage": {
+    "couponSearchFieldLocator" : "#promo_quote_grid_filter_coupon_code",
     "dashboardHeadingText": "Dashboard",
     "loginButtonLabel": "Sign In",
     "navigation": {
@@ -191,6 +192,7 @@
       "storesButtonLabel": "Stores"
     },
     "passwordFieldLabel": "Password",
+    "searchResultsText" : "records found",
     "subNavigation": {
       "allCustomersButtonLabel": "All Customers",
       "cartPriceRulesButtonLabel": "Cart Price Rules",
diff --git a/tests/config/outcome-markers.json b/tests/config/outcome-markers.json
@@ -49,6 +49,11 @@
   "logout": {
     "logoutConfirmationText": "You have signed out"
   },
+  "magentoAdmin" : {
+    "configurationSavedText" : "You saved the configuration.",
+    "couponRuleSavedText" : "You saved the rule.",
+    "noResultsFoundText" : "We couldn't find any records."
+  },
   "miniCart": {
     "configurableProductMinicartTitle": "x Inez Full Zip Jacket",
     "miniCartTitle": "My Cart",
diff --git a/tests/poms/adminhtml/magentoAdmin.page.ts b/tests/poms/adminhtml/magentoAdmin.page.ts
@@ -2,6 +2,7 @@
 
 import { expect, type Locator, type Page } from '@playwright/test';
 import { UIReference, inputValues, outcomeMarker } from '@config';
+import { requireEnv } from '@utils/env.utils';
 
 class MagentoAdminPage {
   readonly page: Page;
@@ -51,17 +52,26 @@ class MagentoAdminPage {
     const addCartPriceRuleButton = this.page.getByRole('button', {name: UIReference.cartPriceRulesPage.addCartPriceRuleButtonLabel});
     await addCartPriceRuleButton.waitFor();
 
-    const couponCellField = this.page.getByRole('cell', {name: magentoCouponCode});
+    const couponSearchField = this.page.locator(UIReference.magentoAdminPage.couponSearchFieldLocator);
+    await couponSearchField.fill(magentoCouponCode);
+    await this.page.getByRole('button', {name: UIReference.general.searchButtonLabel}).click();
+
+    await expect(this.page.getByText(UIReference.magentoAdminPage.searchResultsText)).toBeVisible();
+
+    const couponCellField = this.page.getByRole('cell', { name: outcomeMarker.magentoAdmin.noResultsFoundText });
+
+    // const couponCellField = this.page.getByRole('cell', {name: magentoCouponCode});
 
-    if(await couponCellField.isVisible()){
-      const couponStatusField = this.page.locator('tr').filter({hasText:magentoCouponCode});
+    if(await couponCellField.isHidden()){
+    // if(await couponCellField.isVisible()){
+      const couponStatusField = this.page.locator('tr').filter({hasText:magentoCouponCode}).first();
       const couponStatus = await couponStatusField.innerText();
       if(couponStatus.includes(UIReference.cartPriceRulesPage.couponCodeActiveStatusText)){
           console.log('Coupon already exists and is active');
           return 'Coupon already exists and is active.';
       } else {
         // coupon has been found, but is not active.
-        await couponCellField.click();
+        await couponStatusField.click();
         const activeStatusSwitcher = this.page.locator(UIReference.cartPriceRulesPage.activeStatusSwitcherLocator).first();
         const activeStatusLabel = this.page.locator(UIReference.cartPriceRulesPage.activeStatusLabelLocator).first();
 
@@ -71,7 +81,9 @@ class MagentoAdminPage {
         const saveCouponButton = this.page.getByRole('button', {name:UIReference.cartPriceRulesPage.saveRuleButtonLabel, exact:true});
         await saveCouponButton.click();
 
-        await expect(this.page.locator(UIReference.general.messageLocator)).toBeVisible();
+        await expect(this.page.locator(
+          UIReference.general.messageLocator).filter({hasText: outcomeMarker.magentoAdmin.couponRuleSavedText}
+        ), "Message 'you saved the rule' is visible").toBeVisible();
         return `Coupon code ${magentoCouponCode} has been activated.`;
       }
     } else {
@@ -96,6 +108,7 @@ class MagentoAdminPage {
         select.dispatchEvent(new Event('change'));
       });
 
+      await this.page.getByRole('textbox', { name: UIReference.cartPriceRulesPage.ruleNameFieldLabel }).fill(magentoCouponCode);
       await this.page.locator(UIReference.cartPriceRulesPage.couponTypeSelectField).selectOption({ label: inputValues.coupon.couponType });
       await this.page.getByLabel(UIReference.cartPriceRulesPage.couponCodeFieldLabel).fill(magentoCouponCode);
 
@@ -105,7 +118,9 @@ class MagentoAdminPage {
       const couponSaveButton = this.page.getByRole('button', { name: UIReference.cartPriceRulesPage.saveRuleButtonLabel, exact: true });
       await couponSaveButton.scrollIntoViewIfNeeded();
       await couponSaveButton.click({force:true});
-      await expect(this.page.locator(UIReference.general.messageLocator)).toBeVisible();
+      await expect(this.page.locator(
+          UIReference.general.messageLocator).filter({hasText: outcomeMarker.magentoAdmin.couponRuleSavedText}
+      ), "Message 'you saved the rule' is visible").toBeVisible();
       return `Coupon code ${magentoCouponCode} has been set and activated.`;
     }
   };
@@ -133,7 +148,7 @@ class MagentoAdminPage {
     await allCustomersLink.click();
 
     // Wait for URL. If loading symbol is visible, wait for it to go away
-    await this.page.waitForURL('**/beheer/customer/index/**');
+    await this.page.waitForURL(`**/${requireEnv('MAGENTO_ADMIN_SLUG')}/customer/index/**`);
     if (await this.page.locator(UIReference.general.loadingSpinnerLocator).isVisible()) {
       await this.page.locator(UIReference.general.loadingSpinnerLocator).waitFor({state: 'hidden'});
     }
@@ -186,7 +201,8 @@ class MagentoAdminPage {
     await customerConfigurationLink.waitFor();
     await customerConfigurationLink.click();
 
-    const captchaSettingsBlock = this.page.getByRole('link', { name: UIReference.configurationPage.captchaSectionLabel }).filter({hasNotText: 'documentation'});
+    const captchaSettingsBlock = this.page.getByRole('link', { name: UIReference.configurationPage.captchaSectionLabel })
+      .filter({hasNotText: 'documentation'});
     const captchaSettingsSystemValueCheckbox = this.page.locator(UIReference.configurationPage.captchaSettingSystemCheckbox);
 
     await captchaSettingsBlock.waitFor();
@@ -209,7 +225,7 @@ class MagentoAdminPage {
       const saveConfigButton = this.page.getByRole('button', { name: UIReference.configurationPage.saveConfigButtonLabel });
       await saveConfigButton.click();
 
-      await expect(this.page.locator(UIReference.general.messageLocator)).toBeVisible();
+      await expect(this.page.locator(UIReference.general.messageLocator).filter({hasText: outcomeMarker.magentoAdmin.configurationSavedText})).toBeVisible();
     }
   }
 
@@ -269,7 +285,7 @@ class MagentoAdminPage {
       const saveConfigButton = this.page.getByRole('button', { name: UIReference.configurationPage.saveConfigButtonLabel });
       await saveConfigButton.click();
 
-      await expect(this.page.locator(UIReference.general.messageLocator)).toBeVisible();
+      await expect(this.page.locator(UIReference.general.messageLocator).filter({hasText: outcomeMarker.magentoAdmin.configurationSavedText})).toBeVisible();
     }
   }
 
diff --git a/tests/setup.spec.ts b/tests/setup.spec.ts
@@ -19,51 +19,48 @@ base.beforeEach(async ({ page }, testInfo) => {
 });
 
 base.describe('Setting up the testing environment', () => {
+  // Set tests to serial mode to ensure the order is followed.
+  base.describe.configure({mode:'serial'});
+
   /**
-   * @feature Magento Admin Configuration (Enable multiple admin logins)
-   * @scenario Enable multiple admin logins only in Chromium browser
-   * @given the
-   * @scenario Enable multiple admin logins only in Chromium browser
+   * @feature Magento Admin Configuration (disable login CAPTCHA)
+   * @scenario Disable login CAPTCHA in admin settings via Chromium browser
    * @given the test is running in a Chromium-based browser
    * @when the admin logs in to the Magento dashboard
-   * @and the admin navigates to the configuration page
-   * @and the "Allow Multiple Admin Account Login" setting is updated to "Yes"
+   * @and the admin navigates to the security configuration section
+   * @and the "Enable CAPTCHA on Admin Login" setting is updated to "No"
    * @then the configuration is saved successfully
    * @but if the browser is not Chromium
    * @then the test is skipped with an appropriate message
    */
-  base('Enable_multiple_admin_logins', { tag: '@setup' }, async ({ page, browserName }, testInfo) => {
-    const browserEngine = browserName?.toUpperCase() || "UNKNOWN";
+  base('Disable_login_captcha', { tag: '@setup' }, async ({ page, browserName }, testInfo) => {
+    base.skip(browserName !== 'chromium', `Disabling login captcha through Chromium. This is ${browserName}, therefore test is skipped.`);
 
-    if (browserEngine !== "CHROMIUM") {
-      testInfo.skip(true, `Enabling multiple admin logins through Chromium. This is ${browserEngine}, therefore test is skipped.`);
-    } else {
-      const magentoAdminPage = new MagentoAdminPage(page);
-      await magentoAdminPage.enableMultipleAdminLogins();
-    }
+    const magentoAdminPage = new MagentoAdminPage(page);
+    await magentoAdminPage.disableLoginCaptcha();
   });
 
+
   /**
-   * @feature Magento Admin Configuration (disable login CAPTCHA)
-   * @scenario Disable login CAPTCHA in admin settings via Chromium browser
+   * @feature Magento Admin Configuration (Enable multiple admin logins)
+   * @scenario Enable multiple admin logins only in Chromium browser
+   * @given the
+   * @scenario Enable multiple admin logins only in Chromium browser
    * @given the test is running in a Chromium-based browser
    * @when the admin logs in to the Magento dashboard
-   * @and the admin navigates to the security configuration section
-   * @and the "Enable CAPTCHA on Admin Login" setting is updated to "No"
+   * @and the admin navigates to the configuration page
+   * @and the "Allow Multiple Admin Account Login" setting is updated to "Yes"
    * @then the configuration is saved successfully
    * @but if the browser is not Chromium
    * @then the test is skipped with an appropriate message
    */
-  base('Disable_login_captcha', { tag: '@setup' }, async ({ page, browserName }, testInfo) => {
-    const browserEngine = browserName?.toUpperCase() || "UNKNOWN";
+  base('Enable_multiple_admin_logins', { tag: '@setup' }, async ({ page, browserName }, testInfo) => {
+    base.skip(browserName !== 'chromium', `Disabling login captcha through Chromium. This is ${browserName}, therefore test is skipped.`);
 
-    if (browserEngine !== "CHROMIUM") {
-      testInfo.skip(true, `Disabling login captcha through Chromium. This is ${browserEngine}, therefore test is skipped.`);
-    } else {
-      const magentoAdminPage = new MagentoAdminPage(page);
-      await magentoAdminPage.disableLoginCaptcha();
-    }
+    const magentoAdminPage = new MagentoAdminPage(page);
+    await magentoAdminPage.enableMultipleAdminLogins();
   });
+  
 
   /**
    * @feature Cart Price Rules Configuration
@@ -112,4 +109,4 @@ base.describe('Setting up the testing environment', () => {
       true
     );
   });
-});
+});
