Merge pull request #952 from ibragins/align_6.2.0_with_7

Aligned var names and values to match 7.0
konveyor · Feb 7, 2024 · d91154b · d91154b
2 parents 05f5a94 + a5c445e
commit d91154b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cypress/e2e/tests/upgrade/create_upgrade_data.test.ts b/cypress/e2e/tests/upgrade/create_upgrade_data.test.ts
@@ -164,7 +164,7 @@ describe(["@pre-upgrade"], "Creating pre-requisites before an upgrade", () => {
     });
 
     it("Assess application", function () {
-        assessment.name = this.upgradeData.assessmentName;
+        assessment.name = this.upgradeData.assessmentApplicationName;
         assessment.create();
         assessment.perform_assessment("low", [stakeHolder.name]);
     });

diff --git a/cypress/e2e/types/types.ts b/cypress/e2e/types/types.ts
@@ -163,7 +163,6 @@ export type RbacValidationRules = {
 };
 
 export type UpgradeData = {
-    assessmentName?: string;
     jobFunctionName?: string;
     stakeHolderGroupName?: string;
     stakeHolderName?: string;
@@ -174,6 +173,7 @@ export type UpgradeData = {
     sourceApplicationName?: string;
     binaryApplicationName?: string;
     uploadBinaryApplicationName?: string;
+    assessmentApplicationName?: string;
 };
 
 export type RulesRepositoryFields = {

diff --git a/cypress/fixtures/upgrade-data.json b/cypress/fixtures/upgrade-data.json
@@ -1,5 +1,4 @@
 {
-    "assessmentName": "upgrade-assessment",
     "jobFunctionName": "upgrade-jobFunction",
     "stakeHolderGroupName": "upgrade-stakeHolderGroup",
     "stakeHolderName": "upgrade-stakeHolder",
@@ -10,5 +9,6 @@
     "mavenUsernameCredentialName": "upgrade-mavenUsername",
     "sourceApplicationName": "upgrade-sourceApp",
     "binaryApplicationName": "upgrade-binaryApp",
-    "uploadBinaryApplicationName": "upgrade-uploadBinaryApp"
+    "uploadBinaryApplicationName": "upgrade-uploadBinaryApp",
+    "assessmentApplicationName": "upgrade-assessmentApplication"
 }