Fixing flaky tests - TC: SALEOR_32 and TC: SALEOR_33 (#4847)

saleor · May 8, 2024 · be40ffd · be40ffd
1 parent 434b169
commit be40ffd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/.changeset/little-singers-brake.md b/.changeset/little-singers-brake.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": minor
+---
+
+Fixing flaky tests - TC: SALEOR_32 and TC: SALEOR_33
diff --git a/playwright/pages/shippingRatesPage.ts b/playwright/pages/shippingRatesPage.ts
@@ -3,10 +3,9 @@ import { AddPostalCodeDialog } from "@pages/dialogs/addPostalCodeDialog";
 import { AssignProductsDialog } from "@pages/dialogs/assignProductsDialog";
 import { RightSideDetailsPage } from "@pages/pageElements/rightSideDetailsSection";
 import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
 
-export class ShippingRatesPage {
-  readonly page: Page;
-
+export class ShippingRatesPage extends BasePage {
   readonly basePage: BasePage;
 
   readonly rightSideDetailsPage: RightSideDetailsPage;
@@ -35,8 +34,10 @@ export class ShippingRatesPage {
     readonly excludedProductsRows = page.getByTestId("excluded-products-rows"),
     readonly includePostalCodesRadioButton = page.getByTestId("INCLUDE"),
     readonly assignedPostalCodesRows = page.getByTestId("assigned-postal-codes-rows"),
+    readonly assignDialogProductList = page.getByTestId("assign-product-list"),
+    readonly assignDialogProductRow = page.getByTestId("product-row"),
   ) {
-    this.page = page;
+    super(page);
     this.basePage = new BasePage(page);
     this.assignProductsDialog = new AssignProductsDialog(page);
     this.addPostalCodeDialog = new AddPostalCodeDialog(page);
@@ -46,7 +47,11 @@ export class ShippingRatesPage {
   async addExcludedProduct(name: string) {
     await this.assignProductButton.click();
     await this.assignProductsDialog.searchForProductInDialog(name);
+    await this.waitForDOMToFullyLoad();
+    await this.assignDialogProductList.waitFor({ state: "visible" });
+    await this.assignDialogProductRow.filter({ hasText: name }).waitFor({ state: "visible" });
     await this.assignProductsDialog.selectProduct(name);
+    await expect(this.assignProductsDialog.assignAndSaveButton).toBeEnabled();
     await this.assignProductsDialog.assignAndSaveButton.click();
     await this.assignProductsDialog.assignAndSaveButton.waitFor({
       state: "hidden",

diff --git a/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx b/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx
@@ -156,7 +156,7 @@ const ShippingMethodProductsAddDialog: React.FC<ShippingMethodProductsAddDialogP
             height={450}
           >
             <ResponsiveTable key="table">
-              <TableBody>
+              <TableBody data-test-id="assign-product-list">
                 {renderCollection(
                   products,
                   (product, productIndex) => {