Fixed analysis wizard after 'Run' button was changed to 'Next' (#722)

Signed-off-by: Igor Braginsky <[email protected]>
konveyor · Sep 26, 2023 · 1da2261 · 1da2261
1 parent 901989a
commit 1da2261
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/cypress/e2e/models/migration/applicationinventory/analysis.ts b/cypress/e2e/models/migration/applicationinventory/analysis.ts
@@ -20,7 +20,6 @@ import {
     applicationInventory,
     button,
     migration,
-    next,
     RepositoryType,
     save,
     SEC,
@@ -37,6 +36,7 @@ import {
     doesExistSelector,
     doesExistText,
     inputText,
+    next,
     performRowActionByIcon,
     selectCheckBox,
     selectFormItems,
@@ -255,7 +255,7 @@ export class Analysis extends Application {
         if (this.openSourceLibraries) {
             click("#oss");
         }
-        cy.contains("button", "Next", { timeout: 200 }).click();
+        next();
     }
 
     protected tagsToExclude() {
@@ -279,17 +279,17 @@ export class Analysis extends Application {
         this.selectSourceofAnalysis(this.source);
         if (this.binary) this.uploadBinary();
         this.isNextEnabled();
-        cy.contains(button, next).click();
+        next();
         this.selectTarget(this.target);
-        cy.contains(button, next).click();
+        next();
         this.scopeSelect();
         if (this.customRule) {
             this.uploadCustomRule();
         }
         if (this.customRuleRepository) {
             this.fetchCustomRules();
         }
-        cy.contains(button, next).click();
+        next();
         if (this.excludeRuleTags) {
             this.tagsToExclude();
         }
@@ -300,9 +300,9 @@ export class Analysis extends Application {
             this.disableAutomatedTagging();
         }
         if (!this.sources) {
-            cy.contains(button, next).click();
+            next();
         }
-        cy.contains(button, "Run").click();
+        next();
     }
 
     public static analyzeAll(params: Analysis): void {

diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts
@@ -1774,3 +1774,7 @@ export function selectAssessmentApplications(apps: string): void {
 export function closeModalWindow(): void {
     click(closeModal, false, true);
 }
+
+export function next(): void {
+    clickByText(button, "Next");
+}