From a5c445e82e8f939e4e39d34efe36b50232064397 Mon Sep 17 00:00:00 2001
From: Igor Braginsky <ibragins@redhat.com>
Date: Wed, 7 Feb 2024 13:07:57 +0200
Subject: [PATCH] Aligned var names and values to match 7.0

Signed-off-by: Igor Braginsky <ibragins@redhat.com>
---
 cypress/e2e/tests/upgrade/create_upgrade_data.test.ts | 2 +-
 cypress/e2e/types/types.ts                            | 2 +-
 cypress/fixtures/upgrade-data.json                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cypress/e2e/tests/upgrade/create_upgrade_data.test.ts b/cypress/e2e/tests/upgrade/create_upgrade_data.test.ts
index 503a56984..f9bdb171a 100644
--- 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
index 75647674d..3ae251f5f 100644
--- 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
index 9a74f012e..205daf6ed 100644
--- 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"
 }