From 09d254d50af12c8684c62a9524b33d3630284716 Mon Sep 17 00:00:00 2001
From: wojteknowacki <124166231+wojteknowacki@users.noreply.github.com>
Date: Thu, 20 Jul 2023 15:22:12 +0200
Subject: [PATCH] added assertion to draft fincalization and removed entering
 product details since grid is not always responsive withou extra action
 (#3959)

---
 cypress/e2e/products/productsList/columnPicker.js | 6 +-----
 cypress/support/pages/draftOrderPage.js           | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/products/productsList/columnPicker.js b/cypress/e2e/products/productsList/columnPicker.js
index e8a487e3f..ed912e00e 100644
--- a/cypress/e2e/products/productsList/columnPicker.js
+++ b/cypress/e2e/products/productsList/columnPicker.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress"/>
 /// <reference types="../../../support"/>
 
-import { PRODUCT_DETAILS, SHARED_ELEMENTS } from "../../../elements";
+import { SHARED_ELEMENTS } from "../../../elements";
 import { PRODUCTS_LIST } from "../../../elements/catalog/products/products-list";
 import { LOCAL_STORAGE_FOR_COLUMN_PICKER } from "../../../fixtures";
 import { urlList } from "../../../fixtures/urlList";
@@ -127,10 +127,6 @@ describe("As an admin I should be able to use column picker", () => {
           //next line hides picker
           cy.get(SHARED_ELEMENTS.pageHeader).click({ force: true });
           cy.get(SHARED_ELEMENTS.dynamicColumnContainer).should("not.exist");
-          // now it checks does picking record from grid works when picker is gone
-          cy.clickGridCell(1, 1);
-          cy.waitForRequestAndCheckIfNoErrors("@ProductDetails");
-          cy.get(PRODUCT_DETAILS.productUpdateFormSection).should("be.visible");
         });
     },
   );
diff --git a/cypress/support/pages/draftOrderPage.js b/cypress/support/pages/draftOrderPage.js
index 841fe88dd..8dd4382e3 100644
--- a/cypress/support/pages/draftOrderPage.js
+++ b/cypress/support/pages/draftOrderPage.js
@@ -4,6 +4,7 @@ import { SHARED_ELEMENTS } from "../../elements/shared/sharedElements";
 import { SELECT_SHIPPING_METHOD_FORM } from "../../elements/shipping/select-shipping-method-form";
 
 export function finalizeDraftOrder(name) {
+  cy.addAliasToGraphRequest("OrderDraftFinalize");
   cy.get(DRAFT_ORDER_SELECTORS.addProducts)
     .click()
     .assignElements(name)
@@ -36,5 +37,7 @@ export function finalizeDraftOrder(name) {
     .click()
     .wait("@OrderShippingMethodUpdate")
     .get(DRAFT_ORDER_SELECTORS.finalizeButton)
-    .click();
+    .click()
+    .waitForRequestAndCheckIfNoErrors("@OrderDraftFinalize")
+    .confirmationMessageShouldAppear();
 }