Merge pull request #314 from nesrineabdmouleh/FixGoToNextStepInAutoup…

…gradeModule Fix go to next step for autoupgrade configure page
PrestaShop · Jan 9, 2025 · 09d3e9f · 09d3e9f
2 parents 1803b4f + d9ddff3
commit 09d3e9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/interfaces/BO/modules/autoupgrade/index.ts b/src/interfaces/BO/modules/autoupgrade/index.ts
@@ -9,7 +9,7 @@ export interface ModuleAutoupgradeMainPageInterface extends ModuleConfigurationP
   readonly updateSuccessMessage: string;
 
   cancelBackup(page:Page):Promise<boolean>;
-  checkRequirements(page: Page): Promise<string>;
+  checkRequirements(page: Page): Promise<boolean>;
   checkUpdateSuccess(page:Page):Promise<string>;
   chooseNewVersion(page:Page):Promise<boolean>;
   clickOnLaunchBackup(page:Page):Promise<boolean>;

diff --git a/src/versions/develop/pages/BO/modules/autoupgrade/index.ts b/src/versions/develop/pages/BO/modules/autoupgrade/index.ts
@@ -24,6 +24,8 @@ class Autoupgrade extends ModuleConfiguration implements ModuleAutoupgradeMainPa
 
   private readonly radioCardLoader: string;
 
+  private readonly radioCardLoaderWrapper: string;
+
   private readonly checkRequirementBlock: string;
 
   private readonly checkRequirementsFailedAlerts: string;
@@ -81,6 +83,7 @@ class Autoupgrade extends ModuleConfiguration implements ModuleAutoupgradeMainPa
     // 1 : version choose step
     this.newVersionRadioButton = '#online';
     this.radioCardLoader = '.radio-card__loader-title';
+    this.radioCardLoaderWrapper = '.radio-card__loader-wrapper';
     this.checkRequirementBlock = '.check-requirements';
     this.checkRequirementsFailedAlerts = '.check-requirements--failed';
     this.goToMaintenancePageLink = '#radio_card_online div.radio-card__check-requirements a[href*="AdminMaintenance"]';
@@ -144,11 +147,12 @@ class Autoupgrade extends ModuleConfiguration implements ModuleAutoupgradeMainPa
    * @param page {Page} Browser tab
    * @return {Promise<string}
    */
-  async checkRequirements(page: Page): Promise<string> {
+  async checkRequirements(page: Page): Promise<boolean> {
     await page.locator(this.checkRequirementsButton).click();
     await this.waitForVisibleSelector(page, this.radioCardLoader);
+    await this.waitForHiddenSelector(page, this.radioCardLoaderWrapper);
 
-    return this.getTextContent(page, this.alertSuccessMessage);
+    return this.elementNotVisible(page, `${this.nextStepButton}[disabled='true']`, 2000);
   }
 
   /**