Fix e2e tests

saleor · Apr 23, 2021 · 95c61ce · 95c61ce
1 parent 88b7da6
commit 95c61ce
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/cypress/apiRequests/HomePage.js b/cypress/apiRequests/HomePage.js
@@ -8,25 +8,25 @@ export function getSalesForChannel(channelSlug, period) {
   }`;
   return cy.sendRequestWithQuery(query);
 }
-export function getOrdersForChannel(channelSlug, created) {
+export function getOrdersForChannel(channelSlug, { gte, lte }) {
   const query = `query{
-    orders(created: ${created}, channel:"${channelSlug}"){
+    orders(filter: { created: { gte: "${gte}", lte: "${lte}" } }, channel:"${channelSlug}"){
       totalCount
     }
   }`;
   return cy.sendRequestWithQuery(query);
 }
 export function getOrdersWithStatus(status, channelSlug) {
   const query = `query{
-    orders(status: ${status}, channel:"${channelSlug}"){
+    orders(filter: { status: ${status} }, channel:"${channelSlug}"){
       totalCount
     }
   }`;
   return cy.sendRequestWithQuery(query);
 }
 export function getProductsOutOfStock(channelSlug) {
   const query = `query{
-    products(stockAvailability: OUT_OF_STOCK, channel:"${channelSlug}"){
+    products(filter: { stockAvailability: OUT_OF_STOCK, channel:"${channelSlug}" }){
       totalCount
     }
   }`;

diff --git a/cypress/utils/homePageUtils.js b/cypress/utils/homePageUtils.js
@@ -1,4 +1,5 @@
 import * as homePage from "../apiRequests/HomePage";
+import { getDatePeriod } from "./misc";
 
 export function getOrdersReadyToFulfill(channelSlug) {
   return homePage
@@ -21,7 +22,9 @@ export function getSalesAmount(channelSlug) {
     .its("body.data.ordersTotal.gross.amount");
 }
 export function getTodaysOrders(channelSlug) {
+  const today = getDatePeriod(1);
+
   return homePage
-    .getOrdersForChannel(channelSlug, "TODAY")
+    .getOrdersForChannel(channelSlug, today)
     .its("body.data.orders.totalCount");
 }
diff --git a/cypress/utils/misc.js b/cypress/utils/misc.js
@@ -0,0 +1,16 @@
+import moment from "moment-timezone";
+
+export function getDatePeriod(days) {
+  if (days < 1) {
+    return {};
+  }
+
+  const end = moment().startOf("day");
+  const start = end.subtract(days - 1);
+  const format = "YYYY-MM-DD";
+
+  return {
+    gte: start.format(format),
+    lte: end.format(format)
+  };
+}