diff --git a/cypress/integration/products/productsVariants.js b/cypress/integration/products/productsVariants.js index 371a328ef..fd26b51aa 100644 --- a/cypress/integration/products/productsVariants.js +++ b/cypress/integration/products/productsVariants.js @@ -88,7 +88,7 @@ filterTests({ definedTags: ["all", "critical", "refactored"] }, () => { price, attribute: attributeValues[0] }); - enterHomePageChangeChannelAndReturn(defaultChannel.name); + selectChannelInHeader(defaultChannel.name); variantsShouldBeVisible({ name, price }); getProductVariants(createdProduct.id, defaultChannel.slug); }) diff --git a/cypress/support/pages/catalog/products/VariantsPage.js b/cypress/support/pages/catalog/products/VariantsPage.js index b3c450d70..4a0568b0d 100644 --- a/cypress/support/pages/catalog/products/VariantsPage.js +++ b/cypress/support/pages/catalog/products/VariantsPage.js @@ -46,6 +46,7 @@ export function createFirstVariant({ cy.addAliasToGraphRequest("ProductVariantBulkCreate") .get(VARIANTS_SELECTORS.nextButton) .click() + .confirmationMessageShouldAppear() .waitForRequestAndCheckIfNoErrors("@ProductVariantBulkCreate") .waitForProgressBarToNotBeVisible() .get(AVAILABLE_CHANNELS_FORM.menageChannelsButton) @@ -68,7 +69,9 @@ export function createVariant({ .get(VARIANTS_SELECTORS.skuInput) .should("be.enabled") .get(BUTTON_SELECTORS.back) - .click(); + .click() + .get(PRODUCT_DETAILS.productNameInput) + .should("be.enabled"); selectChannelForVariantAndFillUpPrices({ channelName, variantName: attributeName, diff --git a/cypress/support/pages/channelsPage.js b/cypress/support/pages/channelsPage.js index aae534e06..5347f552a 100644 --- a/cypress/support/pages/channelsPage.js +++ b/cypress/support/pages/channelsPage.js @@ -64,8 +64,9 @@ export function selectChannelInPicker(channelName) { export function selectChannelInHeader(channelName) { cy.get(HEADER_SELECTORS.channelSelect).click(); cy.contains(SHARED_ELEMENTS.selectOption, channelName) - .scrollIntoView() - .click(); + .click({ force: true }) + .get(SHARED_ELEMENTS.selectOption) + .should("not.exist"); } export function selectChannelInDetailsPages(channelName) {