Fix failing e2e

docs/running-tests.md

@@ -25,3 +25,9 @@ You are ready to run Playwright commands like:
 ```shell
 pnpm run e2e
 ```
+
+Note that if you have changed `BASE_URL` to run tests on different environment you will need to clear login data which is stored locally in `playwright/.auth` folder:
+
+```
+pnpm run e2e:clean-auth
+```

package.json

@@ -24,6 +24,7 @@
     "dev": "vite --host",
     "dev:no-strict": "cross-env VITE_DISABLE_STRICT_MODE=true vite --host",
     "e2e": "pnpm exec playwright test --grep \"#e2e\"",
+    "e2e:clean-auth": "rm -rf ./playwright/.auth",
     "e2e:ui": "pnpm exec playwright test --ui",
     "extract-messages": "formatjs extract 'src/**/*.{ts,tsx}' --ignore '**/*.d.ts' --out-file locale/defaultMessages.json --format scripts/formatter.cjs",
     "fetch-local-schema": "node scripts/fetch-local-schema.cjs",

playwright/data/copy.ts

@@ -1,3 +1,6 @@
 export const AVAILABILITY = {
+  /** Used for product pages with new AvailabilityCard */
+  in1Of: "In 1 of",
+  /** Used for voucher/discount pages with old ChannelsAvailabilityCard */
   in1OutOf: "In 1 out of",
 };

playwright/pages/productPage.ts

@@ -29,9 +29,7 @@ export class ProductPage extends BasePage {
   constructor(
     page: Page,
     readonly productsNames = page.getByTestId("name"),
-    readonly productAvailableInChannelsText = page.getByTestId(
-      "product-available-in-channels-text",
-    ),
+    readonly productAvailableInChannelsText = page.getByTestId("availability-card"),
     readonly createProductButton = page.getByTestId("add-product"),
     readonly cogShowMoreButtonButton = page.getByTestId("show-more-button"),
     readonly exportButton = page.getByTestId("export"),

playwright/tests/customers.spec.ts

@@ -222,12 +222,11 @@ test("TC: SALEOR_207 Issue a new gift card for the customer #e2e #customer", asy
   await customersPage.issueGiftCardDialog.typeCustomTag(faker.lorem.word());
   await customersPage.issueGiftCardDialog.typeNote(faker.lorem.sentences(3));
   await customersPage.issueGiftCardDialog.clickIssueButton();
-  await customersPage.expectSuccessBanner();
+  await giftCardsPage.expectSuccessBanner({ message: "Gift card created" });
   await expect(giftCardsPage.issueGiftCardDialog.cardCode).toBeVisible();
 
   await giftCardsPage.issueGiftCardDialog.clickCopyCodeButton();
-  await giftCardsPage.expectSuccessBanner();
+  await giftCardsPage.expectSuccessBanner({ message: "Copied to clipboard" });
   await giftCardsPage.issueGiftCardDialog.clickOkButton();
   await giftCardsPage.expectElementIsHidden(giftCardsPage.giftCardDialog);
-  await giftCardsPage.expectSuccessBanner({ message: "Successfully created gift card" });
 });

playwright/tests/giftCards.spec.ts

@@ -22,14 +22,14 @@ test("TC: SALEOR_105 Issue gift card #e2e #gift", async () => {
   await giftCardsPage.issueGiftCardDialog.clickRequiresActivationCheckbox();
   await giftCardsPage.issueGiftCardDialog.clickIssueButton();
   await expect(giftCardsPage.issueGiftCardDialog.cardCode).toBeVisible();
+  await giftCardsPage.expectSuccessBanner({ message: "Gift card created" });
 
   const code = (await giftCardsPage.issueGiftCardDialog.cardCode.innerText()).slice(-4);
 
   await giftCardsPage.issueGiftCardDialog.clickCopyCodeButton();
-  await giftCardsPage.expectSuccessBanner();
+  await giftCardsPage.expectSuccessBanner({ message: "Copied to clipboard" });
   await giftCardsPage.issueGiftCardDialog.clickOkButton();
   await giftCardsPage.giftCardDialog.waitFor({ state: "hidden" });
-  await giftCardsPage.expectSuccessBanner({ message: "Successfully created gift card" });
   await giftCardsPage.gotoGiftCardsListView();
   await giftCardsPage.gridCanvas
     .getByText(`Code ending with ${code}`)
@@ -43,13 +43,14 @@ test("TC: SALEOR_106 Issue gift card with specific customer and expiry date #e2e
   await giftCardsPage.issueGiftCardDialog.clickSendToCustomerCheckbox();
   await giftCardsPage.issueGiftCardDialog.selectCustomer("e2e-customer to-be-activated");
   await giftCardsPage.issueGiftCardDialog.clickIssueButton();
+  await giftCardsPage.expectSuccessBanner({ message: "Gift card created" });
   await expect(giftCardsPage.issueGiftCardDialog.cardCode).toBeVisible();
 
   const fullCode = await giftCardsPage.issueGiftCardDialog.cardCode.innerText();
 
   await giftCardsPage.issueGiftCardDialog.clickOkButton();
   await giftCardsPage.giftCardDialog.waitFor({ state: "hidden" });
-  await giftCardsPage.expectSuccessBanner({ message: "Successfully created gift card" });
+  await giftCardsPage.expectSuccessBanner({ message: "Copied to clipboard" });
   await giftCardsPage.gotoGiftCardsListView();
   await giftCardsPage.searchAndFindRowIndexes(fullCode);
   expect(

playwright/tests/product.spec.ts

@@ -156,7 +156,7 @@ test("TC: SALEOR_46 As an admin, I should be able to update a product by uploadi
   await expect(
     productPage.productAvailableInChannelsText,
     "Label copy shows 1 out of 7 channels ",
-  ).toContainText(AVAILABILITY.in1OutOf);
+  ).toContainText(AVAILABILITY.in1Of);
   expect(
     await productPage.productImage.count(),
     "Newly added single image should be present",

src/components/notifications/Toast.tsx

@@ -122,6 +122,7 @@ export const Toast = ({ id, type, title, description, action }: ToastProps) => {
 
   return (
     <Box
+      data-test-type={type}
       display="flex"
       alignItems="flex-start"
       gap={3}

src/fragments/orders.ts

@@ -152,6 +152,72 @@ export const fragmentOrderLine = gql`
   }
 `;
 
+// Slim fragment for order line mutations - includes only data that changes
+// when lines are added/updated/deleted (lines + pricing + shipping if no longer required)
+export const fragmentOrderLinesUpdate = gql`
+  fragment OrderLinesUpdate on Order {
+    id
+    lines {
+      ...OrderLine
+    }
+    subtotal {
+      gross {
+        ...Money
+      }
+      net {
+        ...Money
+      }
+    }
+    total {
+      gross {
+        ...Money
+      }
+      net {
+        ...Money
+      }
+      tax {
+        ...Money
+      }
+    }
+    undiscountedTotal {
+      gross {
+        ...Money
+      }
+      net {
+        ...Money
+      }
+    }
+    # Shipping can change when lines are deleted/added
+    # (shippingMethod, shippingPrice, shippingMethodName are reset when isShippingRequired becomes false)
+    isShippingRequired
+    shippingMethod {
+      id
+    }
+    shippingPrice {
+      gross {
+        amount
+        currency
+      }
+    }
+    shippingMethodName
+    collectionPointName
+    # Available shipping methods can change based on order contents (weight, items)
+    shippingMethods {
+      id
+      name
+      price {
+        ...Money
+      }
+      active
+      message
+    }
+    # Discounts shown in order summary
+    discounts {
+      ...OrderDiscount
+    }
+  }
+`;
+
 export const fragmentOrderLineMetadata = gql`
   fragment OrderLineMetadata on OrderLine {
     metadata {