From d4991e56c7d71474207003fa6254176659b4ca1c Mon Sep 17 00:00:00 2001
From: wojteknowacki <124166231+wojteknowacki@users.noreply.github.com>
Date: Thu, 27 Jul 2023 15:55:41 +0200
Subject: [PATCH] fixed products presest last assertion, changed quantity of
 product on draft orders (#4025)

---
 cypress/e2e/orders/orders.js                  | 11 ++++++++--
 .../products/productsList/productPresets.js   | 20 ++++++++++++++-----
 cypress/support/pages/ordersOperations.js     |  2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/orders/orders.js b/cypress/e2e/orders/orders.js
index 86d920e40..532d0e127 100644
--- a/cypress/e2e/orders/orders.js
+++ b/cypress/e2e/orders/orders.js
@@ -9,7 +9,11 @@ import {
   ORDERS_SELECTORS,
   SHARED_ELEMENTS,
 } from "../../elements/";
-import { MESSAGES, ONE_PERMISSION_USERS, urlList } from "../../fixtures";
+import {
+  MESSAGES,
+  ONE_PERMISSION_USERS,
+  urlList,
+} from "../../fixtures";
 import {
   createCustomer,
   getOrder,
@@ -28,6 +32,9 @@ import {
   productsUtils,
   updateTaxConfigurationForChannel,
 } from "../../support/api/utils/";
+import {
+  ensureCanvasStatic,
+} from "../../support/customCommands/sharedElementsOperations/canvas";
 import {
   addNewProductToOrder,
   addPrivateMetadataFieldFulfillmentOrder,
@@ -308,7 +315,7 @@ describe("Orders", () => {
         address,
       }).then(unconfirmedOrderResponse => {
         cy.visit(urlList.orders + `${unconfirmedOrderResponse.order.id}`);
-
+        ensureCanvasStatic(SHARED_ELEMENTS.dataGridTable);
         changeQuantityOfProducts();
 
         cy.get(ORDERS_SELECTORS.orderSummarySubtotalPriceRow).should(
diff --git a/cypress/e2e/products/productsList/productPresets.js b/cypress/e2e/products/productsList/productPresets.js
index d0abda9cd..cd78d4dbf 100644
--- a/cypress/e2e/products/productsList/productPresets.js
+++ b/cypress/e2e/products/productsList/productPresets.js
@@ -1,10 +1,20 @@
 /// <reference types="cypress"/>
 /// <reference types="../../../support"/>
 
-import { PRODUCTS_LIST } from "../../../elements/catalog/products/products-list";
-import { SEARCH } from "../../../elements/shared";
-import { LOCAL_STORAGE_KEYS, urlList } from "../../../fixtures/";
-import { ensureCanvasStatic } from "../../../support/customCommands/sharedElementsOperations/canvas";
+import {
+  PRODUCTS_LIST,
+} from "../../../elements/catalog/products/products-list";
+import {
+  PRESETS,
+  SEARCH,
+} from "../../../elements/shared";
+import {
+  LOCAL_STORAGE_KEYS,
+  urlList,
+} from "../../../fixtures/";
+import {
+  ensureCanvasStatic,
+} from "../../../support/customCommands/sharedElementsOperations/canvas";
 import {
   addPresetWithName,
   clickDeletePresetButton,
@@ -90,7 +100,7 @@ describe("As a user I should be able to save selected filters with search querie
           localStorage.getItem(LOCAL_STORAGE_KEYS.keys.productPresets),
         ).to.not.contains(`query=${secondPreset}`);
         clickShowSavedPresetsButton();
-        cy.contains(firstPreset).should("be.visible");
+        cy.get(PRESETS.savedPreset).contains(firstPreset).should("be.visible");
       });
     },
   );
diff --git a/cypress/support/pages/ordersOperations.js b/cypress/support/pages/ordersOperations.js
index ee9c48a88..fbdcb84d6 100644
--- a/cypress/support/pages/ordersOperations.js
+++ b/cypress/support/pages/ordersOperations.js
@@ -37,7 +37,7 @@ export function changeQuantityOfProducts() {
   cy.get(ORDERS_SELECTORS.dataGridTable).should("be.visible");
   cy.get(ORDERS_SELECTORS.quantityCellFirstRowOrderDetails)
     .click({ force: true })
-    .wait(200)
+    .should("have.attr", "aria-selected", "true")
     .click({ force: true })
     .wait(1000);
   cy.get(ORDERS_SELECTORS.gridClip)