From 683527ebe9a0e7bcebb528a30386961361a4bc22 Mon Sep 17 00:00:00 2001
From: Karolina Rakoczy <rakoczy.karolina@gmail.com>
Date: Mon, 18 Jul 2022 14:00:24 +0300
Subject: [PATCH] Fix cancel fulfillment test (#2169)

* Fix test for cancel fulfillment

* add TC numbers
---
 cypress/e2e/orders/orders.js | 75 +++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/cypress/e2e/orders/orders.js b/cypress/e2e/orders/orders.js
index 0943a79e1..83560c32d 100644
--- a/cypress/e2e/orders/orders.js
+++ b/cypress/e2e/orders/orders.js
@@ -106,7 +106,7 @@ describe("Orders", () => {
   });
 
   xit(
-    "should create order with selected channel",
+    "should create order with selected channel. TC: SALEOR_2104",
     { tags: ["@orders", "@allEnv"] },
     () => {
       cy.visit(urlList.orders)
@@ -124,7 +124,7 @@ describe("Orders", () => {
   );
 
   it(
-    "should not be possible to change channel in order",
+    "should not be possible to change channel in order. TC: SALEOR_2105",
     { tags: ["@orders", "@allEnv", "@stable"] },
     () => {
       createOrder({
@@ -143,42 +143,47 @@ describe("Orders", () => {
     },
   );
 
-  it("should cancel fulfillment", { tags: ["@orders", "@allEnv"] }, () => {
-    let order;
-    createFulfilledOrder({
-      customerId: customer.id,
-      channelId: defaultChannel.id,
-      shippingMethodId: shippingMethod.id,
-      variantsList,
-      address,
-      warehouse: warehouse.id,
-    })
-      .then(({ order: orderResp }) => {
-        order = orderResp;
-        cy.visit(urlList.orders);
-        cy.expectSkeletonIsVisible();
-        cy.contains(ORDERS_SELECTORS.orderRow, order.number).click();
-        cy.get(SHARED_ELEMENTS.skeleton)
-          .should("not.exist")
-          .get(ORDERS_SELECTORS.cancelFulfillment)
-          .click()
-          .fillAutocompleteSelect(
-            ORDERS_SELECTORS.cancelFulfillmentSelectField,
-            warehouse.name,
-          )
-          .addAliasToGraphRequest("OrderFulfillmentCancel")
-          .get(BUTTON_SELECTORS.submit)
-          .click()
-          .waitForRequestAndCheckIfNoErrors("@OrderFulfillmentCancel");
-        getOrder(order.id);
+  it(
+    "should cancel fulfillment. TC: SALEOR_2106",
+    { tags: ["@orders", "@allEnv"] },
+    () => {
+      let order;
+      createFulfilledOrder({
+        customerId: customer.id,
+        channelId: defaultChannel.id,
+        shippingMethodId: shippingMethod.id,
+        variantsList,
+        address,
+        warehouse: warehouse.id,
       })
-      .then(orderResp => {
-        expect(orderResp.status).to.be.eq("UNFULFILLED");
-      });
-  });
+        .then(({ order: orderResp }) => {
+          order = orderResp;
+          cy.visit(urlList.orders);
+          cy.expectSkeletonIsVisible();
+          cy.contains(ORDERS_SELECTORS.orderRow, order.number).click();
+          cy.get(SHARED_ELEMENTS.skeleton)
+            .should("not.exist")
+            .get(ORDERS_SELECTORS.cancelFulfillment)
+            .click()
+            .get(ORDERS_SELECTORS.cancelFulfillmentSelectField)
+            .click()
+            .get(BUTTON_SELECTORS.selectOption)
+            .first()
+            .click()
+            .addAliasToGraphRequest("OrderFulfillmentCancel")
+            .get(BUTTON_SELECTORS.submit)
+            .click()
+            .waitForRequestAndCheckIfNoErrors("@OrderFulfillmentCancel");
+          getOrder(order.id);
+        })
+        .then(orderResp => {
+          expect(orderResp.status).to.be.eq("UNFULFILLED");
+        });
+    },
+  );
 
   it(
-    "should make a refund",
+    "should make a refund. TC: 2107",
     { tags: ["@orders", "@allEnv", "@stable"] },
     () => {
       let order;