[RFR][JF] Fix task-manager tests (#1311)

* Use validateTextPresence for accuracy Signed-off-by: Maayan Hadasi <[email protected]> * Increasing 'wait' for task details text Signed-off-by: Maayan Hadasi <[email protected]> * Ensuring the 'sort by status' test is executed last Signed-off-by: Maayan Hadasi <[email protected]> --------- Signed-off-by: Maayan Hadasi <[email protected]>
konveyor · Jan 21, 2025 · 6520c82 · 6520c82
1 parent 09a7bcd
commit 6520c82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/cypress/e2e/tests/migration/task-manager/sorting.filter.pagination.test.ts b/cypress/e2e/tests/migration/task-manager/sorting.filter.pagination.test.ts
@@ -23,7 +23,6 @@ import {
     getRandomAnalysisData,
     getRandomApplicationData,
     login,
-    notExists,
     validateNumberPresence,
     validatePagination,
     validateSortBy,
@@ -32,46 +31,36 @@ import {
 import { Analysis } from "../../../models/migration/applicationinventory/analysis";
 import { TaskManager } from "../../../models/migration/task-manager/task-manager";
 import { TaskFilter, TaskKind, TaskStatus, trTag } from "../../../types/constants";
-import { TaskManagerColumns, tasksTable } from "../../../views/taskmanager.view";
+import { TaskManagerColumns } from "../../../views/taskmanager.view";
 
 describe(["@tier3"], "Filtering, sorting and pagination in Task Manager Page", function () {
     const applicationsList: Analysis[] = [];
-    const sortByList = ["ID", "Application", "Status", "Kind", "Priority", "Created By"];
+    const sortByList = ["ID", "Application", "Kind", "Priority", "Created By", "Status"];
 
     before("Login", function () {
+        let dayTraderApp: Analysis;
+
         login();
         deleteApplicationTableRows();
         cy.fixture("application").then((appData) => {
             cy.fixture("analysis").then((analysisData) => {
-                for (let i = 0; i < 3; i++) {
-                    const bookServerApp = new Analysis(
-                        getRandomApplicationData("TaskFilteringApp1_" + i, {
-                            sourceData: appData["bookserver-app"],
-                        }),
-                        getRandomAnalysisData(analysisData["analysis_for_openSourceLibraries"])
-                    );
-                    applicationsList.push(bookServerApp);
-
-                    const dayTraderApp = new Analysis(
-                        getRandomApplicationData("TaskFilteringApp2_" + i, {
+                for (let i = 0; i < 6; i++) {
+                    dayTraderApp = new Analysis(
+                        getRandomApplicationData("TaskFilteringApp_" + i, {
                             sourceData: appData["daytrader-app"],
                         }),
                         getRandomAnalysisData(analysisData["source+dep_analysis_on_daytrader-app"])
                     );
                     applicationsList.push(dayTraderApp);
                 }
                 applicationsList.forEach((application) => application.create());
+                Analysis.analyzeAll(dayTraderApp);
             });
         });
     });
 
     it("Filtering tasks", function () {
-        // Analyzing daytrader app for pagination test to generate issues more than 10.
-        const dayTraderApp = applicationsList[1];
-
-        Analysis.analyzeAll(dayTraderApp);
         TaskManager.open();
-
         cy.intercept("GET", "/hub/tasks*").as("getTasks");
 
         // Filter by status
@@ -98,7 +87,7 @@ describe(["@tier3"], "Filtering, sorting and pagination in Task Manager Page", f
             .then((responseBody) => {
                 TaskManager.applyFilter(TaskFilter.id, responseBody[0].id.toString());
                 validateNumberPresence(TaskManagerColumns.id, responseBody[0].id);
-                notExists(responseBody[1].id.toString(), tasksTable);
+                validateTextPresence(TaskManagerColumns.id, responseBody[1].id.toString(), false);
                 clearAllFilters();
             });
 

diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts
@@ -1976,7 +1976,7 @@ export function normalizeText(text: string): string {
 }
 
 export function taskDetailsSanity(appName: string, taskKind: TaskKind, taskStatus?: TaskStatus) {
-    cy.wait(2 * SEC);
+    cy.wait(5 * SEC);
     cy.get(taskDetailsEditor)
         .invoke("text")
         .then((text) => {