[RFR] Fix custom migration crud test (#1207)

* fix custom migration target crud test Signed-off-by: Alejandro Brugarolas <[email protected]> * fix custom migration target crud test Signed-off-by: Alejandro Brugarolas <[email protected]> --------- Signed-off-by: Alejandro Brugarolas <[email protected]>
konveyor · Aug 28, 2024 · e7ec17b · e7ec17b
1 parent 5c2d78f
commit e7ec17b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/cypress/e2e/models/administration/custom-migration-targets/custom-migration-target.ts b/cypress/e2e/models/administration/custom-migration-targets/custom-migration-target.ts
@@ -25,7 +25,7 @@ import {
     sourcesToggle,
 } from "../../../views/custom-migration-target.view";
 import { RulesManualFields, RulesRepositoryFields } from "../../../types/types";
-import { actionSelectToggle, submitButton } from "../../../views/common.view";
+import { submitButton } from "../../../views/common.view";
 
 export interface CustomMigrationTarget {
     name: string;
@@ -143,7 +143,7 @@ export class CustomMigrationTarget {
 
     public static selectLanguage(language: Languages) {
         CustomMigrationTarget.open();
-        cy.get(actionSelectToggle, { timeout: 30 * SEC }).click();
+        cy.get(CustomMigrationTargetView.languageDropdown, { timeout: 30 * SEC }).click();
         clickByText("button", language);
     }
 

diff --git a/cypress/e2e/models/migration/applicationinventory/analysis.ts b/cypress/e2e/models/migration/applicationinventory/analysis.ts
@@ -18,6 +18,7 @@ import {
     analyzeAppButton,
     analyzeButton,
     button,
+    clearAllFilters,
     Languages,
     ReportTypeSelectors,
     RepositoryType,
@@ -32,6 +33,7 @@ import {
     clickByText,
     clickTab,
     clickWithin,
+    clickWithinByText,
     doesExistSelector,
     doesExistText,
     inputText,
@@ -68,6 +70,7 @@ import {
     expandAll,
     fileName,
     kebabTopMenuButton,
+    languageSelectionDropdown,
     manageCredentials,
     mavenCredential,
     openjdkToggleButton,
@@ -82,7 +85,6 @@ import {
     kebabMenu,
 } from "../../../views/applicationinventory.view";
 import { CustomMigrationTargetView } from "../../../views/custom-migration-target.view";
-import { actionSelectToggle } from "../../../views/common.view";
 
 export class Analysis extends Application {
     name: string;
@@ -168,25 +170,20 @@ export class Analysis extends Application {
      */
     public static selectLanguage(language: Languages, removePreSelected = false) {
         cy.wait(2 * SEC);
-        click(actionSelectToggle);
 
         if (removePreSelected) {
-            cy.get("#filter-by-language input[type=checkbox]").each(($checkbox) => {
-                cy.wrap($checkbox).then((checkbox) => {
-                    if (checkbox.is(":checked")) {
-                        cy.wrap($checkbox).uncheck();
-                    }
-                });
-            });
-            // find the language's input checkbox and make sure it is checked
-            cy.get(`${actionSelectToggle} + .pf-v5-c-menu`)
-                .contains(language)
-                .closest(".pf-v5-c-menu__list-item")
-                .find("input[type=checkbox]")
-                .check();
-
-            click(actionSelectToggle);
+            clickWithinByText(".pf-v5-c-wizard__main-body", "button", clearAllFilters);
         }
+
+        cy.get(languageSelectionDropdown).click();
+
+        cy.get(`#filter-control-name-select-typeahead-listbox > li`)
+            .contains(language)
+            .closest(".pf-v5-c-menu__list-item")
+            .find("input[type=checkbox]")
+            .check();
+
+        cy.get(languageSelectionDropdown).click();
     }
 
     public selectTarget(target: string[]): void {

diff --git a/cypress/e2e/views/analysis.view.ts b/cypress/e2e/views/analysis.view.ts
@@ -44,3 +44,4 @@ export const closeWizard = ".pf-v5-c-wizard__close > .pf-v5-c-button";
 export const codeEditorControls = "div.pf-v5-c-code-editor__controls";
 export const menuToggle = "button.pf-v5-c-menu-toggle";
 export const menuList = "div.pf-v5-c-menu";
+export const languageSelectionDropdown = "#filter-control-name-Languages";
diff --git a/cypress/e2e/views/custom-migration-target.view.ts b/cypress/e2e/views/custom-migration-target.view.ts
@@ -23,4 +23,5 @@ export enum CustomMigrationTargetView {
     dragButton = "#drag-button",
     card = ".pf-v5-c-card",
     cardContainer = "div.dnd-grid",
+    languageDropdown = "#action-select-toggle",
 }