tests for products

cypress/apiRequests/Product.js

@@ -1,4 +1,7 @@
+import Utils from "./utils/Utils";
+
 class Product {
+  utils = new Utils();
   getFirstProducts(first, search) {
     const filter = search
       ? `, filter:{
@@ -23,13 +26,13 @@ class Product {
       .then(resp => resp.body.data.products.edges);
   }
 
-  updateChannelInProduct(
+  updateChannelInProduct({
     productId,
     channelId,
     isPublished = true,
     isAvailableForPurchase = true,
     visibleInListings = true
-  ) {
+  }) {
     const mutation = `mutation{
               productChannelListingUpdate(id:"${productId}",
               input:{
@@ -94,19 +97,36 @@ class Product {
     price = 1,
     costPrice = 1
   ) {
-    const channelListings = channelId
+    // const channelListings = channelId
-      ? `channelListings:{
+    //   ? `channelListings:{
+    //   channelId:"${channelId}"
+    //   price:"${price}"
+    //   costPrice:"${costPrice}"
+    // }`
+    //   : "";
+
+    const channelListings = this.utils.getValueWithDefault(
+      channelId,
+      `channelListings:{
       channelId:"${channelId}"
       price:"${price}"
       costPrice:"${costPrice}"
     }`
-      : "";
+    );
-    const stocks = warehouseId
+
-      ? `stocks:{
+    const stocks = this.utils.getValueWithDefault(
+      warehouseId,
+      `stocks:{
       warehouse:"${warehouseId}"
       quantity:${quantity}
     }`
-      : "";
+    );
+    // warehouseId
+    //   ? `stocks:{
+    //   warehouse:"${warehouseId}"
+    //   quantity:${quantity}
+    // }`
+    //   : "";
 
     const mutation = `mutation{
         productVariantBulkCreate(product: "${productId}", variants: {

cypress/apiRequests/utils/Utils.js

@@ -0,0 +1,6 @@
+class Utils {
+  getValueWithDefault(condition, value, defaultValue = "") {
+    return condition ? value : defaultValue;
+  }
+}
+export default Utils;

cypress/integration/channels.js

@@ -44,10 +44,13 @@ describe("Channels", () => {
 
   it("should create new channel", () => {
     const randomChannel = `${channelStartsWith} ${faker.random.number()}`;
-    cy.visit(urlList.channels).waitForGraph("Channels");
+    cy.addAliasToGraphRequest("Channels");
+    cy.visit(urlList.channels);
+    cy.wait("@Channels");
+    cy.addAliasToGraphRequest("Channel");
     channelsSteps.createChannelByView(randomChannel, currency);
     // New channel should be visible in channels list
-    cy.waitForGraph("Channel")
+    cy.wait("@Channel")
       .get(ADD_CHANNEL_FORM_SELECTORS.backToChannelsList)
       .click()
       .get(CHANNELS_SELECTORS.channelsTable)
@@ -62,7 +65,9 @@ describe("Channels", () => {
       .click();
 
     // new channel should be visible at product availability form
-    cy.visit(urlList.products).waitForGraph("InitialProductFilterData");
+    cy.addAliasToGraphRequest("InitialProductFilterData");
+    cy.visit(urlList.products);
+    cy.wait("@InitialProductFilterData");
     cy.get(PRODUCTS_SELECTORS.productsList)
       .first()
       .click()
@@ -103,15 +108,18 @@ describe("Channels", () => {
       randomChannelToDelete,
       currency
     );
-    cy.visit(urlList.channels).waitForGraph("Channels");
+    cy.addAliasToGraphRequest("Channels");
+    cy.visit(urlList.channels);
+    cy.wait("@Channels");
     cy.get(CHANNELS_SELECTORS.channelName)
       .contains(randomChannelToDelete)
       .parentsUntil(CHANNELS_SELECTORS.channelsTable)
       .find("button")
-      .click()
+      .click();
-      .get(BUTTON_SELECTORS.submit)
+    cy.addAliasToGraphRequest("Channels");
-      .click()
+    cy.get(BUTTON_SELECTORS.submit).click();
-      .waitForGraph("Channels");
+    cy.wait("@Channels");
+
     cy.get(CHANNELS_SELECTORS.channelName)
       .contains(randomChannelToDelete)
       .should("not.exist");

cypress/integration/homePage.js

@@ -48,12 +48,12 @@ describe("Homepage analytics", () => {
       )
       .then(resp => {
         customerId = resp.body.data.customerCreate.user.id;
-        shippingUtils.createShipping(
+        shippingUtils.createShipping({
-          defaultChannel.id,
+          channelId: defaultChannel.id,
-          randomName,
+          name: randomName,
-          addresses.plAddress,
+          address: addresses.plAddress,
-          shippingPrice
+          price: shippingPrice
-        );
+        });
       })
       .then(() => {
         productsUtils.createTypeAttributeAndCategoryForProduct(randomName);
@@ -63,16 +63,16 @@ describe("Homepage analytics", () => {
         const productType = productsUtils.getProductType();
         const attribute = productsUtils.getAttribute();
         const category = productsUtils.getCategory();
-        productsUtils.createProductInChannel(
+        productsUtils.createProductInChannel({
-          randomName,
+          name: randomName,
-          defaultChannel.id,
+          channelId: defaultChannel.id,
-          warehouse.id,
+          warehouseId: warehouse.id,
-          20,
+          quantityInWarehouse: 20,
-          productType.id,
+          productTypeId: productType.id,
-          attribute.id,
+          attributeId: attribute.id,
-          category.id,
+          categoryId: category.id,
-          productPrice
+          price: productPrice
-        );
+        });
       });
   });
 
@@ -154,16 +154,16 @@ describe("Homepage analytics", () => {
     const attribute = productsUtils.getAttribute();
     const category = productsUtils.getCategory();
 
-    productsOutOfStockUtils.createProductInChannel(
+    productsOutOfStockUtils.createProductInChannel({
-      productOutOfStockRandomName,
+      name: productOutOfStockRandomName,
-      defaultChannel.id,
+      channelId: defaultChannel.id,
-      warehouse.id,
+      warehouseId: warehouse.id,
-      0,
+      quantityInWarehouse: 0,
-      productType.id,
+      productTypeId: productType.id,
-      attribute.id,
+      attributeId: attribute.id,
-      category.id,
+      categoryId: category.id,
-      productPrice
+      price: productPrice
-    );
+    });
 
     cy.get("@productsOutOfStock").then(productsOutOfStockBefore => {
       const allProductsOutOfStock = productsOutOfStockBefore + 1;

cypress/integration/products/menageProducts/availableForPurchaseProducts.js

@@ -34,12 +34,11 @@ describe("Products available in listings", () => {
         cy.fixture("addresses");
       })
       .then(addressesFixture => {
-        shippingUtils.createShipping(
+        shippingUtils.createShipping({
-          defaultChannel,
+          channelId: defaultChannel.id,
           name,
-          addressesFixture.plAddress,
+          address: addressesFixture.plAddress
-          10
+        });
-        );
       })
       .then(() => {
         warehouse = shippingUtils.getWarehouse();
@@ -59,19 +58,15 @@ describe("Products available in listings", () => {
   it("should update product to available for purchase", () => {
     const productName = `${startsWith}${faker.random.number()}`;
     productsUtils
-      .createProductInChannel(
+      .createProductInChannel({
-        productName,
+        name: productName,
-        defaultChannel.id,
+        channelId: defaultChannel.id,
-        warehouse.id,
+        warehouseId: warehouse.id,
-        10,
+        productTypeId: productType.id,
-        productType.id,
+        attributeId: attribute.id,
-        attribute.id,
+        categoryId: category.id,
-        category.id,
+        isAvailableForPurchase: false
-        1,
+      })
-        true,
-        false,
-        true
-      )
       .then(() => {
         const productUrl = `${urlList.products}${
           productsUtils.getCreatedProduct().id
@@ -92,33 +87,29 @@ describe("Products available in listings", () => {
   it("should update product to not available for purchase", () => {
     const productName = `${startsWith}${faker.random.number()}`;
     productsUtils
-      .createProductInChannel(
+      .createProductInChannel({
-        productName,
+        name: productName,
-        defaultChannel.id,
+        channelId: defaultChannel.id,
-        warehouse.id,
+        warehouseId: warehouse.id,
-        10,
+        productTypeId: productType.id,
-        productType.id,
+        attributeId: attribute.id,
-        attribute.id,
+        categoryId: category.id
-        category.id,
+      })
-        1,
-        true,
-        true,
-        true
-      )
       .then(() => {
         const productUrl = `${urlList.products}${
           productsUtils.getCreatedProduct().id
         }`;
         productSteps.updateProductIsAvailableForPurchase(productUrl, false);
-        frontShopProductUtils
+      })
-          .isProductAvailableForPurchase(
+      .then(() => {
-            productsUtils.getCreatedProduct().id,
+        frontShopProductUtils.isProductAvailableForPurchase(
-            defaultChannel.slug,
+          productsUtils.getCreatedProduct().id,
-            productName
+          defaultChannel.slug,
-          )
+          productName
-          .then(isProductVisible => {
+        );
-            expect(isProductVisible).to.be.eq(false);
+      })
-          });
+      .then(isProductVisible => {
+        expect(isProductVisible).to.be.eq(false);
       });
   });
 });

cypress/integration/products/menageProducts/publishedProducts.js

@@ -39,19 +39,15 @@ describe("Published products", () => {
       .getDefaultChannel()
       .then(channel => {
         defaultChannel = channel;
-        productsUtils.createProductInChannel(
+        productsUtils.createProductInChannel({
-          productName,
+          name: productName,
-          defaultChannel.id,
+          channelId: defaultChannel.id,
-          null,
+          productTypeId: productType.id,
-          null,
+          attributeId: attribute.id,
-          productType.id,
+          categoryId: category.id,
-          attribute.id,
+          isPublished: false,
-          category.id,
+          isAvailableForPurchase: false
-          1,
+        });
-          false,
-          false,
-          true
-        );
       })
       .then(() => {
         const product = productsUtils.getCreatedProduct();
@@ -76,15 +72,13 @@ describe("Published products", () => {
       .getDefaultChannel()
       .then(channel => {
         defaultChannel = channel;
-        productsUtils.createProductInChannel(
+        productsUtils.createProductInChannel({
-          productName,
+          name: productName,
-          defaultChannel.id,
+          channelId: defaultChannel.id,
-          null,
+          productTypeId: productType.id,
-          null,
+          attributeId: attribute.id,
-          productType.id,
+          categoryId: category.id
-          attribute.id,
+        });
-          category.id
-        );
       })
       .then(() => {
         product = productsUtils.getCreatedProduct();

cypress/integration/products/menageProducts/visibleInListingsProducts.js

@@ -39,19 +39,15 @@ describe("Products displayed in listings", () => {
       .getDefaultChannel()
       .then(channel => {
         defaultChannel = channel;
-        productsUtils.createProductInChannel(
+        productsUtils.createProductInChannel({
-          productName,
+          name: productName,
-          defaultChannel.id,
+          channelId: defaultChannel.id,
-          null,
+          productTypeId: productType.id,
-          null,
+          attributeId: attribute.id,
-          productType.id,
+          categoryId: category.id,
-          attribute.id,
+          visibleInListings: false,
-          category.id,
+          isAvailableForPurchase: false
-          1,
+        });
-          true,
-          false,
-          false
-        );
       })
       .then(() => {
         const product = productsUtils.getCreatedProduct();
@@ -73,19 +69,14 @@ describe("Products displayed in listings", () => {
       .getDefaultChannel()
       .then(channel => {
         defaultChannel = channel;
-        productsUtils.createProductInChannel(
+        productsUtils.createProductInChannel({
-          productName,
+          name: productName,
-          defaultChannel.id,
+          channelId: defaultChannel.id,
-          null,
+          productTypeId: productType.id,
-          null,
+          attributeId: attribute.id,
-          productType.id,
+          categoryId: category.id,
-          attribute.id,
+          visibleInListings: true
-          category.id,
+        });
-          1,
-          true,
-          false,
-          true
-        );
       })
       .then(() => {
         const product = productsUtils.getCreatedProduct();

cypress/steps/homePageSteps.js

@@ -1,12 +1,12 @@
 import { HEADER_SELECTORS } from "../elements/header/header-selectors";
 class HomePageSteps {
   changeChannel(channelName) {
-    cy.get(HEADER_SELECTORS.channelSelect)
+    cy.get(HEADER_SELECTORS.channelSelect).click();
-      .click()
+    cy.addAliasToGraphRequest("Home");
-      .get(HEADER_SELECTORS.channelSelectList)
+    cy.get(HEADER_SELECTORS.channelSelectList)
       .contains(channelName)
-      .click()
+      .click();
-      .waitForGraph("Home");
+    cy.wait("@Home");
   }
 }
 export default HomePageSteps;

cypress/steps/productSteps.js

@@ -1,30 +1,20 @@
 import { PRODUCTS_SELECTORS } from "../elements/catalog/product-selectors";
 
 class ProductSteps {
+  valueTrue = PRODUCTS_SELECTORS.radioButtonsValueTrue;
+  valueFalse = PRODUCTS_SELECTORS.radioButtonsValueFalse;
+
   updateProductIsAvailableForPurchase(productUrl, isAvailableForPurchase) {
-    let isAvailableForPurchaseSelector;
+    const isAvailableForPurchaseSelector = isAvailableForPurchase
-    if (isAvailableForPurchase) {
+      ? this.valueTrue
-      isAvailableForPurchaseSelector = PRODUCTS_SELECTORS.radioButtonsValueTrue;
+      : this.valueFalse;
-    } else {
+    const availableForPurchaseSelector = `${PRODUCTS_SELECTORS.availableForPurchaseRadioButtons}${isAvailableForPurchaseSelector}`;
-      isAvailableForPurchaseSelector =
+    this.updateProductMenageInChannel(productUrl, availableForPurchaseSelector);
-        PRODUCTS_SELECTORS.radioButtonsValueFalse;
-    }
-    this.updateProductMenageInChannel(
-      productUrl,
-      `${PRODUCTS_SELECTORS.availableForPurchaseRadioButtons}${isAvailableForPurchaseSelector}`
-    );
   }
   updateProductPublish(productUrl, isPublished) {
-    let isPublishedSelector;
+    const isPublishedSelector = isPublished ? this.valueTrue : this.valueFalse;
-    if (isPublished) {
+    const publishedSelector = `${PRODUCTS_SELECTORS.publishedRadioButtons}${isPublishedSelector}`;
-      isPublishedSelector = PRODUCTS_SELECTORS.radioButtonsValueTrue;
+    this.updateProductMenageInChannel(productUrl, publishedSelector);
-    } else {
-      isPublishedSelector = PRODUCTS_SELECTORS.radioButtonsValueFalse;
-    }
-    this.updateProductMenageInChannel(
-      productUrl,
-      `${PRODUCTS_SELECTORS.publishedRadioButtons}${isPublishedSelector}`
-    );
   }
   updateProductVisibleInListings(productUrl) {
     this.updateProductMenageInChannel(
@@ -37,10 +27,11 @@ class ProductSteps {
       .get(PRODUCTS_SELECTORS.assignedChannels)
       .click()
       .get(menageSelector)
+      .click();
+    cy.addAliasToGraphRequest("ProductChannelListingUpdate");
+    cy.get(PRODUCTS_SELECTORS.saveBtn)
       .click()
-      .get(PRODUCTS_SELECTORS.saveBtn)
+      .wait("@ProductChannelListingUpdate");
-      .click()
-      .waitForGraph("ProductChannelListingUpdate");
   }
 }
 export default ProductSteps;

cypress/support/index.js

@@ -21,7 +21,7 @@ Cypress.Commands.add("clearSessionData", () => {
   });
 });
 
-Cypress.Commands.add("waitForGraph", operationName => {
+Cypress.Commands.add("addAliasToGraphRequest", operationName => {
   cy.intercept("POST", urlList.apiUri, req => {
     req.statusCode = 200;
     const requestBody = req.body;
@@ -37,7 +37,6 @@ Cypress.Commands.add("waitForGraph", operationName => {
       }
     }
   });
-  cy.wait(`@${operationName}`);
 });
 
 Cypress.Commands.add("sendRequestWithQuery", query => {

cypress/utils/productsUtils.js

@@ -22,28 +22,28 @@ class ProductsUtils {
     ).then(() => this.createVariant(this.product.id, name));
   }
 
-  createProductInChannel(
+  createProductInChannel({
     name,
     channelId,
-    warehouseId,
+    warehouseId = null,
-    quantityInWarehouse,
+    quantityInWarehouse = 10,
     productTypeId,
     attributeId,
     categoryId,
-    price,
+    price = 1,
     isPublished = true,
     isAvailableForPurchase = true,
     visibleInListings = true
-  ) {
+  }) {
     return this.createProduct(attributeId, name, productTypeId, categoryId)
       .then(() =>
-        this.productRequest.updateChannelInProduct(
+        this.productRequest.updateChannelInProduct({
-          this.product.id,
+          productId: this.product.id,
           channelId,
           isPublished,
           isAvailableForPurchase,
           visibleInListings
-        )
+        })
       )
       .then(() => {
         this.createVariant(

cypress/utils/shippingUtils.js

@@ -8,7 +8,7 @@ class ShippingUtils {
   shippingZone;
   warehouse;
 
-  createShipping(channelId, name, address, price) {
+  createShipping({ channelId, name, address, price = 1 }) {
     return this.createShippingZone(name, address.country)
       .then(() => this.createWarehouse(name, this.shippingZone.id, address))
       .then(() => this.createShippingRate(name, this.shippingZone.id))