Merge pull request #70 from spryker/fix-flaky-dms-test

Fixed flaky tests in DMS.
spryker · Dec 17, 2024 · 8b6cb07 · 8b6cb07
2 parents e1d61c8 + 1ebf453
commit 8b6cb07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cypress/e2e/yves/checkout/basic-checkout-dms.cy.ts b/cypress/e2e/yves/checkout/basic-checkout-dms.cy.ts
@@ -8,6 +8,7 @@ import {
   UserLoginScenario,
   SetupDefaultStoreRelationsScenario,
 } from '@scenarios/backoffice';
+import { retryableBefore } from '../../../support/e2e';
 
 describeIfDynamicStoreEnabled('basic checkout dms', { tags: ['@yves', '@checkout', '@dms'] }, (): void => {
   const catalogPage = container.get(CatalogPage);
@@ -24,7 +25,7 @@ describeIfDynamicStoreEnabled('basic checkout dms', { tags: ['@yves', '@checkout
   let staticFixtures: BasicCheckoutDmsStaticFixtures;
   let dynamicFixtures: BasicCheckoutDmsDynamicFixtures;
 
-  before((): void => {
+  retryableBefore((): void => {
     ({ staticFixtures, dynamicFixtures } = Cypress.env());
 
     userLoginScenario.execute({

diff --git a/cypress/support/scenarios/backoffice/enable-cms-block-for-all-stores-scenario.ts b/cypress/support/scenarios/backoffice/enable-cms-block-for-all-stores-scenario.ts
@@ -13,14 +13,13 @@ export class EnableCmsBlockForAllStoresScenario {
 
     this.blockListPage.interceptTable({ url: '/cms-block-gui/list-block/table**' }).then(() => {
       this.blockListPage
-        .findWithRetry({
+        .find({
           searchQuery: params.cmsBlockName,
           tableUrl: '/cms-block-gui/list-block/table**',
-          pageUrl: this.blockListPage.getPageUrl(),
         })
-        .then(($storeRow) => {
-          if (!this.blockListPage.rowIsAssignedToStore({ row: $storeRow, storeName: params.storeName })) {
-            this.blockListPage.clickEditAction($storeRow);
+        .then(($cmsBlockRow) => {
+          if (!this.blockListPage.rowIsAssignedToStore({ row: $cmsBlockRow, storeName: params.storeName })) {
+            this.blockListPage.clickEditAction($cmsBlockRow);
 
             this.blockUpdatePage.assignAllAvailableStore();
             this.blockUpdatePage.save();