Fixed RBAC tests for architect

Signed-off-by: Igor Braginsky <ibragins@redhat.com>
konveyor · Nov 19, 2023 · 24a7adc · 24a7adc
1 parent a43cbb1
commit 24a7adc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/cypress/e2e/models/migration/applicationinventory/application.ts b/cypress/e2e/models/migration/applicationinventory/application.ts
@@ -67,6 +67,7 @@ import {
     doesExistButton,
     validateTextPresence,
     validateNumberPresence,
+    clickWithin,
 } from "../../../../utils/utils";
 import { AppIssue, applicationData, RbacValidationRules } from "../../../types/types";
 import { kebabButton, rightSideMenu, sourceDropdown } from "../../../views/analysis.view";
@@ -383,27 +384,35 @@ export class Application {
 
     validateAnalysisAvailableActions(rbacRules: RbacValidationRules): void {
         Application.open();
-        clickByText(navTab, analysis);
         selectItemsPerPage(100);
-        cy.wait(5 * SEC);
+        cy.wait(SEC);
         cy.get(tdTag)
             .contains(this.name)
             .closest(trTag)
             .within(() => {
-                click(`${kebabMenu} > button`);
+                clickWithin("#row-actions", button);
+                doesExistButton(assessAppButton, rbacRules["Assess"]);
                 doesExistText(
                     "Analysis details",
                     rbacRules["analysis applicable options"]["Analysis details"]
                 );
-                doesExistText(
-                    "Cancel analysis",
-                    rbacRules["analysis applicable options"]["Cancel analysis"]
-                );
+                // doesExistText(
+                //     "Cancel analysis",
+                //     rbacRules["analysis applicable options"]["Cancel analysis"]
+                // );
                 doesExistText(
                     "Manage credentials",
                     rbacRules["analysis applicable options"]["Manage credentials"]
                 );
                 doesExistText("Delete", rbacRules["analysis applicable options"]["Delete"]);
+                doesExistText(
+                    "Discard review",
+                    rbacRules["assessment applicable options"]["Discard assessment"]
+                );
+                doesExistText(
+                    "Manage dependencies",
+                    rbacRules["assessment applicable options"]["Manage dependencies"]
+                );
             });
     }
 
@@ -418,7 +427,7 @@ export class Application {
                 cy.wait(SEC);
                 click(kebabButton);
                 doesExistText(
-                    "Discard assessment/review",
+                    "Discard review",
                     rbacRules["assessment applicable options"]["Discard assessment"]
                 );
                 doesExistText(
@@ -429,7 +438,6 @@ export class Application {
     }
     validateUploadBinary(rbacRules: RbacValidationRules): void {
         Application.open();
-        clickByText(button, analysis);
         selectItemsPerPage(100);
         this.selectApplication();
         cy.contains("button", analyzeButton, { timeout: 20 * SEC })

diff --git a/cypress/e2e/tests/rbac/architect.test.ts b/cypress/e2e/tests/rbac/architect.test.ts
@@ -18,12 +18,18 @@ limitations under the License.
 import { User } from "../../models/keycloak/users/user";
 import { getRandomCredentialsData, getRandomUserData } from "../../../utils/data_utils";
 import { UserArchitect } from "../../models/keycloak/users/userArchitect";
-import { getRandomApplicationData, login, logout } from "../../../utils/utils";
+import {
+    createMultipleStakeholders,
+    getRandomApplicationData,
+    login,
+    logout,
+} from "../../../utils/utils";
 import { Analysis } from "../../models/migration/applicationinventory/analysis";
 import { CredentialsSourceControlUsername } from "../../models/administration/credentials/credentialsSourceControlUsername";
 import { CredentialType } from "../../types/constants";
 import { Application } from "../../models/migration/applicationinventory/application";
 import { Assessment } from "../../models/migration/applicationinventory/assessment";
+import { Stakeholders } from "../../models/migration/controls/stakeholders";
 
 describe(["@tier2", "@rhsso"], "Architect RBAC operations", function () {
     let userArchitect = new UserArchitect(getRandomUserData());
@@ -77,14 +83,10 @@ describe(["@tier2", "@rhsso"], "Architect RBAC operations", function () {
         Analysis.validateAnalyzeButton(this.rbacRules);
     });
 
-    it("Architect, validate analysis details and cancel analysis buttons presence", function () {
+    it("Architect, validate analysis and assessment context menu buttons presence", function () {
         application.validateAnalysisAvailableActions(this.rbacRules);
     });
 
-    it("Architect, validate assessment context menu buttons presence", function () {
-        application.validateAssessmentAvailableOptions(this.rbacRules);
-    });
-
     it("Architect, validate availability of binary upload functionality", function () {
         application.validateUploadBinary(this.rbacRules);
     });