Update getRandomApplicationData()

Signed-off-by: Nandini Chandra <[email protected]>
konveyor · Aug 1, 2023 · ac985de · ac985de
1 parent f98d8f7
commit ac985de
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/cypress/e2e/models/migration/applicationinventory/application.ts b/cypress/e2e/models/migration/applicationinventory/application.ts
@@ -322,7 +322,7 @@ export class Application {
 
     tagAndCategoryExists(tags: string | string[][]): void {
         // Verify that tags and categories are present on Application details -> Tags page
-        this.applicationDetailsTab("Tags");
+        // this.applicationDetailsTab("Tags");
         if (Array.isArray(tags)) {
             // For Tags and Categories
             for (var tagIndex = 0; tagIndex < tags.length; tagIndex++) {
@@ -332,7 +332,7 @@ export class Application {
         }
         // For Tags
         else cy.get(applicationTag).should("contain", tags);
-        this.closeApplicationDetails();
+        // this.closeApplicationDetails();
     }
 
     static validateAssessButton(rbacRules: RbacValidationRules) {

diff --git a/cypress/e2e/tests/migration/applicationinventory/analysis/auto_tagging_filter.test.ts b/cypress/e2e/tests/migration/applicationinventory/analysis/auto_tagging_filter.test.ts
@@ -27,13 +27,16 @@ import {
 } from "../../../../types/constants";
 import * as data from "../../../../../utils/data_utils";
 import { CredentialsSourceControlUsername } from "../../../../models/administration/credentials/credentialsSourceControlUsername";
+import { Tag } from "../../../../models/migration/controls/tags";
+import { TagCategory } from "../../../../models/migration/controls/tagcategory";
 let source_credential;
 var applicationsList: Array<Analysis> = [];
+let tagCategory;
+let tag;
 
 describe(["@tier1"], "Source Analysis", () => {
     before("Login", function () {
         login();
-
         source_credential = new CredentialsSourceControlUsername(
             data.getRandomCredentialsData(
                 CredentialType.sourceControl,
@@ -42,6 +45,16 @@ describe(["@tier1"], "Source Analysis", () => {
             )
         );
         source_credential.create();
+
+        tagCategory = new TagCategory(
+            data.getRandomWord(8),
+            data.getColor(),
+            data.getRandomNumber(1, 30)
+        );
+        tagCategory.create();
+
+        tag = new Tag(data.getRandomWord(6), tagCategory.name);
+        tag.create();
     });
 
     beforeEach("Load data", function () {
@@ -60,7 +73,7 @@ describe(["@tier1"], "Source Analysis", () => {
     it("Apply search filter on app details page", function () {
         // Automates Polarion MTA-311
         const application = new Analysis(
-            getRandomApplicationData("tackleTestApp_Source_autoTagging", {
+            getRandomApplicationData("tackleTestApp_Source_autoTagging", tag.name, {
                 sourceData: this.appData["tackle-testapp-git"],
             }),
             getRandomAnalysisData(this.analysisData["analysis_for_enableTagging"])
@@ -72,14 +85,14 @@ describe(["@tier1"], "Source Analysis", () => {
         application.manageCredentials(source_credential.name, null);
         application.analyze();
         application.verifyAnalysisStatus("Completed");
-        application.applicationDetailsTab("Tags");
         cy.wait(2000);
 
         // Filter tags by source:Analysis
         application.filterTags("Analysis");
         application.tagAndCategoryExists(
             this.analysisData["analysis_for_enableTagging"]["techTags"]
         );
+        cy.get("span.pf-c-label__content").should('not.contain', tag.name);
         application.closeApplicationDetails();
         application.delete();
     });

diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts
@@ -1124,6 +1124,7 @@ export function getRowsAmount(): number {
 
 export function getRandomApplicationData(
     appName?,
+    tags?,
     options?: { sourceData?; binaryData? }
 ): applicationData {
     let name = data.getAppName();
@@ -1154,6 +1155,10 @@ export function getRandomApplicationData(
             appdata["packaging"] = options.binaryData.packaging;
         }
     }
+
+    if (tags) {
+        appdata["tags"] = tags;
+    }
     return appdata;
 }