Merge branch 'main' into adress-change-tests

saleor · Dec 27, 2023 · 28ab526 · 28ab526
2 parents 5c69c10 + 951b181
commit 28ab526
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 6 deletions.
diff --git a/.changeset/brave-dragons-warn.md b/.changeset/brave-dragons-warn.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": minor
+---
+
+add tracking number, mark as paid and fulfill tests
diff --git a/playwright/pages/basePage.ts b/playwright/pages/basePage.ts
@@ -103,9 +103,10 @@ export class BasePage {
     return Math.floor(Math.random() * (max + 1));
   }
 
-  async waitForGrid() {
+  async waitForGrid(gridIndex = 0) {
     await this.gridCanvas
       .locator("table")
+      .nth(gridIndex)
       .waitFor({ state: "attached", timeout: 10000 });
   }
 

diff --git a/playwright/pages/dialogs/addTrackingDialog.ts b/playwright/pages/dialogs/addTrackingDialog.ts
@@ -0,0 +1,22 @@
+import type { Page } from "@playwright/test";
+
+export class AddTrackingDialog {
+  constructor(
+    page: Page,
+    readonly trackingNumberInput = page
+      .getByTestId("tracking-number-input")
+      .locator("input"),
+    readonly confirmTrackingNumberButton = page.getByTestId(
+      "confirm-tracking-number-button",
+    ),
+  ) {}
+
+  async typeTrackingNumber(trackingNumber = "123456789") {
+    await this.trackingNumberInput.fill(trackingNumber);
+  }
+  async typeTrackingNumberAndSave(trackingNumber: string) {
+    await this.typeTrackingNumber(trackingNumber);
+    await this.confirmTrackingNumberButton.click();
+    await this.confirmTrackingNumberButton.waitFor({ state: "hidden" });
+  }
+}
diff --git a/playwright/pages/ordersPage.ts b/playwright/pages/ordersPage.ts
@@ -1,4 +1,5 @@
 import { URL_LIST } from "@data/url";
+import { AddTrackingDialog } from "@dialogs/addTrackingDialog";
 import { ManualTransactionDialog } from "@dialogs/manualTransactionDialog";
 import { MarkOrderAsPaidDialog } from "@dialogs/markOrderAsPaidDialog";
 import { RightSideDetailsPage } from "@pageElements/rightSideDetailsSection";
@@ -24,12 +25,16 @@ export class OrdersPage extends BasePage {
     page: Page,
     readonly createOrderButton = page.getByTestId("create-order-button"),
     readonly markAsPaidButton = page.getByTestId("markAsPaidButton"),
+    readonly addTrackingButton = page.getByTestId("add-tracking-button"),
+    readonly editTrackingButton = page.getByTestId("edit-tracking-button"),
+    readonly setTrackingNumber = page.getByTestId("tracking-number-set"),
     readonly manualTransactionButton = page.getByTestId(
       "captureManualTransactionButton",
     ),
     readonly orderSummarySection = page.getByTestId("OrderSummaryCard"),
     readonly paymentSummarySection = page.getByTestId("payment-section"),
     readonly paymentStatusInfo = page.getByTestId("payment-status"),
+    readonly balanceStatusInfo = page.getByTestId("order-balance-status"),
     readonly fulfillButton = page.getByTestId("fulfill-button"),
     readonly addProducts = page.getByTestId("add-products-button"),
     readonly orderTransactionsList = page
@@ -64,7 +69,6 @@ export class OrdersPage extends BasePage {
   async clickCreateOrderButton() {
     await this.createOrderButton.click();
   }
-
   async clickAddTrackingButton() {
     await this.addTrackingButton.click();
   }

diff --git a/playwright/tests/orders.spec.ts b/playwright/tests/orders.spec.ts
@@ -133,7 +133,7 @@ test("TC: SALEOR_78 Capture partial amounts by manual transactions and fulfill o
   ).toContainText("Unfulfilled");
   expect(
     await ordersPage.paymentStatusInfo,
-    "Order should fully paid",
+    "Order should be fully paid",
   ).toContainText("Fully paid");
 
   await ordersPage.clickFulfillButton();

diff --git a/src/orders/components/OrderFulfilledProductsCard/ActionButtons.tsx b/src/orders/components/OrderFulfilledProductsCard/ActionButtons.tsx
@@ -74,13 +74,21 @@ const ActionButtons: React.FC<AcionButtonsProps> = ({
 
   return hasTrackingNumber ? (
     <CardActions className={classes.actions}>
-      <Button variant="primary" onClick={onTrackingCodeAdd}>
+      <Button
+        data-test-id="edit-tracking-button"
+        variant="primary"
+        onClick={onTrackingCodeAdd}
+      >
         <FormattedMessage {...actionButtonsMessages.editTracking} />
       </Button>
     </CardActions>
   ) : (
     <CardActions className={classes.actions}>
-      <Button variant="primary" onClick={onTrackingCodeAdd}>
+      <Button
+        variant="primary"
+        onClick={onTrackingCodeAdd}
+        data-test-id="add-tracking-button"
+      >
         <FormattedMessage {...actionButtonsMessages.addTracking} />
       </Button>
     </CardActions>

diff --git a/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx b/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx
@@ -57,6 +57,7 @@ const ExtraInfoLines: React.FC<ExtraInfoLinesProps> = ({ fulfillment }) => {
             values={{
               trackingNumber: (
                 <Typography
+                  data-test-id="tracking-number-set"
                   className={classes.infoLabel}
                   color="textPrimary"
                   variant="body2"

diff --git a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
@@ -82,6 +82,7 @@ const OrderFulfillmentTrackingDialog: React.FC<
                 onChange={change}
                 value={data.trackingNumber}
                 fullWidth
+                data-test-id="tracking-number-input"
               />
               {errors.length > 0 && (
                 <>
@@ -99,6 +100,7 @@ const OrderFulfillmentTrackingDialog: React.FC<
             <DialogActions>
               <BackButton onClick={onClose} />
               <ConfirmButton
+                data-test-id="confirm-tracking-number-button"
                 transitionState={confirmButtonState}
                 onClick={submit}
               >

diff --git a/src/orders/components/OrderPayment/OrderPayment.tsx b/src/orders/components/OrderPayment/OrderPayment.tsx
@@ -88,6 +88,7 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
                 className={classes.rightmostLeftAlignedElement}
                 label={payment.localized}
                 color={payment.status}
+                data-test-id="payment-status"
               />
               {order?.status !== OrderStatus.CANCELED &&
                 (canCapture || canRefund || canVoid || canMarkAsPaid) && (
@@ -264,7 +265,10 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
             )}
           >
             <FormattedMessage {...orderPaymentMessages.outstanding} />
-            <div className={classes.leftmostRightAlignedElement}>
+            <div
+              className={classes.leftmostRightAlignedElement}
+              data-test-id="order-balance-status"
+            >
               {order?.totalBalance.amount === 0 ? (
                 <FormattedMessage {...orderPaymentMessages.settled} />
               ) : (