Fixed tests with cms blocks.

Author: dmiseev

cypress/e2e/yves/customer-account-management/customer-auth-dms.cy.ts

@@ -1,7 +1,7 @@
 import { container } from '@utils';
 import { LoginPage, CustomerOverviewPage } from '@pages/yves';
 import { CustomerAuthDmsDynamicFixtures, CustomerAuthDmsStaticFixtures } from '@interfaces/yves';
-import { CreateStoreScenario, UserLoginScenario } from '@scenarios/backoffice';
+import { CreateStoreScenario, EnableCmsBlockForAllStoresScenario, UserLoginScenario } from '@scenarios/backoffice';
 import { SelectStoreScenario } from '@scenarios/yves';
 
 describeIfDynamicStoreEnabled(
@@ -13,6 +13,7 @@ describeIfDynamicStoreEnabled(
     const userLoginScenario = container.get(UserLoginScenario);
     const createStoreScenario = container.get(CreateStoreScenario);
     const selectStoreScenario = container.get(SelectStoreScenario);
+    const enableCmsBlockForAllStoresScenario = container.get(EnableCmsBlockForAllStoresScenario);
 
     let dynamicFixtures: CustomerAuthDmsDynamicFixtures;
     let staticFixtures: CustomerAuthDmsStaticFixtures;
@@ -26,6 +27,17 @@ describeIfDynamicStoreEnabled(
       });
 
       createStoreScenario.execute({ store: staticFixtures.store, shouldTriggerPublishAndSync: true });
+
+      enableCmsBlockForAllStoresScenario.execute({
+        cmsBlockName: 'customer-registration_token--text',
+        storeName: staticFixtures.store.name,
+        shouldTriggerPublishAndSync: true,
+      });
+      enableCmsBlockForAllStoresScenario.execute({
+        cmsBlockName: 'customer-registration_token--html',
+        storeName: staticFixtures.store.name,
+        shouldTriggerPublishAndSync: true,
+      });
     });
 
     beforeEach((): void => {

cypress/support/pages/backoffice/backoffice-page.ts

@@ -60,6 +60,55 @@ export class BackofficePage extends AbstractPage {
         });
       });
   };
+
+  public findWithRetry = (params: UpdateWithRetryParams): Cypress.Chainable => {
+    const retryCount = 2;
+    let attempts = 0;
+
+    const searchAndIntercept = (): Cypress.Chainable => {
+      attempts++;
+      // eslint-disable-next-line cypress/unsafe-to-chain-command
+      cy.get('[type="search"]')
+        .clear()
+        .then(() => {
+          cy.visitBackoffice(params.pageUrl);
+        });
+
+      return this.interceptTable({ url: params.tableUrl }).then(() => {
+        // eslint-disable-next-line cypress/unsafe-to-chain-command
+        cy.get('[type="search"]')
+          .invoke('val', params.searchQuery)
+          .trigger('input')
+          .then(() => {
+            return this.interceptTable({ url: params.tableUrl, expectedCount: params.expectedCount }, () => {
+              cy.get('tbody > tr:visible').then(($rows) => {
+                let rows = Cypress.$($rows);
+
+                if (params.rowFilter && params.rowFilter.length > 0) {
+                  params.rowFilter.forEach((filterFn) => {
+                    if (rows.length > 0) {
+                      rows = rows.filter((index, row) => filterFn(Cypress.$(row)));
+                    }
+                  });
+                }
+
+                if (rows.length > 0) {
+                  return cy.wrap(rows.first());
+                } else if (attempts < retryCount) {
+                  cy.log(`Retrying... Attempt ${attempts}`);
+                  return searchAndIntercept();
+                } else {
+                  cy.log('No rows found after filtering');
+                  return null;
+                }
+              });
+            });
+          });
+      });
+    };
+
+    return searchAndIntercept();
+  };
 }
 
 export enum ActionEnum {
@@ -84,3 +133,11 @@ interface UpdateParams {
   rowFilter?: Array<(row: JQuery<HTMLElement>) => boolean>;
   expectedCount?: number;
 }
+
+interface UpdateWithRetryParams {
+  searchQuery: string;
+  tableUrl: string;
+  rowFilter?: Array<(row: JQuery<HTMLElement>) => boolean>;
+  expectedCount?: number | null;
+  pageUrl: string;
+}

cypress/support/pages/backoffice/index.ts

@@ -7,6 +7,8 @@ export * from './merchant/create/merchant-create-page';
 export * from './merchant/list/merchant-list-page';
 export * from './merchant/update/merchant-update-page';
 export * from './merchant-user/create/merchant-user-create-page';
+export * from './cms/block/list/block-list-page';
+export * from './cms/block/update/block-update-page';
 export * from './cms/page/create/cms-page-create-page';
 export * from './cms/cms-placeholder/edit/cms-placeholder-edit-page';
 export * from './sales/detail/sales-detail-page';

cypress/support/pages/backoffice/product-management/edit/variant/product-management-edit-variant-repository.ts

@@ -12,6 +12,6 @@ export class ProductManagementEditVariantRepository {
   getSearchableENCheckbox = (): Cypress.Chainable => cy.get('#product_concrete_form_edit_general_en_US_is_searchable');
   getPriceStockTab = (): Cypress.Chainable => cy.get('[data-tab-content-id="tab-content-price"]');
   getIsNeverOutOfStockCheckbox = (): Cypress.Chainable =>
-    cy.get('#product_concrete_form_edit_price_and_stock_1_is_never_out_of_stock');
+    cy.get('#product_concrete_form_edit_price_and_stock_0_is_never_out_of_stock');
   getSaveButton = (): Cypress.Chainable => cy.get('[type="submit"]');
 }

cypress/support/scenarios/backoffice/enable-cms-block-for-all-stores-scenario.ts

@@ -0,0 +1,41 @@
+import { autoWired } from '@utils';
+import { inject, injectable } from 'inversify';
+import { BlockUpdatePage, BlockListPage } from '@pages/backoffice';
+
+@injectable()
+@autoWired
+export class EnableCmsBlockForAllStoresScenario {
+  @inject(BlockUpdatePage) private blockUpdatePage: BlockUpdatePage;
+  @inject(BlockListPage) private blockListPage: BlockListPage;
+
+  execute = (params: ExecuteParams): void => {
+    this.blockListPage.visit();
+
+    this.blockListPage.interceptTable({ url: '/cms-block-gui/list-block/table**' }).then(() => {
+      this.blockListPage
+        .findWithRetry({
+          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);
+
+            this.blockUpdatePage.assignAllAvailableStore();
+            this.blockUpdatePage.save();
+
+            if (params?.shouldTriggerPublishAndSync) {
+              cy.runCliCommands(['console queue:worker:start --stop-when-empty']);
+            }
+          }
+        });
+    });
+  };
+}
+
+interface ExecuteParams {
+  cmsBlockName: string;
+  shouldTriggerPublishAndSync?: boolean;
+  storeName?: string;
+}

cypress/support/scenarios/backoffice/index.ts

@@ -12,3 +12,4 @@ export * from './assign-store-to-default-shipment-methods-scenario';
 export * from './assign-store-to-default-payment-methods-scenario';
 export * from './assign-store-to-default-shipment-types-scenario';
 export * from './assign-store-to-default-warehouse-scenario';
+export * from './enable-cms-block-for-all-stores-scenario';