From bd92fcb2bb060ac3e45fe2be59602df0e439902f Mon Sep 17 00:00:00 2001
From: Guohua Ouyang <gouyang@redhat.com>
Date: Thu, 9 Sep 2021 09:16:47 +0800
Subject: [PATCH] check bootsource URL is displaying on review step

---
 .../tests/disks/validate-rootdisk.spec.ts                 | 5 +++++
 .../tests/regression/validate-nad-for-pxe.spec.ts         | 5 +++++
 .../tests/vm-template/template-rhel9.spec.ts              | 6 ++++++
 .../integration-tests-cypress/views/selector-wizard.ts    | 3 +++
 .../integration-tests-cypress/views/wizard.ts             | 8 +++++++-
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/disks/validate-rootdisk.spec.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/disks/validate-rootdisk.spec.ts
index 9b673be1be1..ca6f7bcc6aa 100644
--- a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/disks/validate-rootdisk.spec.ts
+++ b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/disks/validate-rootdisk.spec.ts
@@ -60,6 +60,7 @@ describe('Validate root disk', () => {
   before(() => {
     cy.Login();
     cy.visit('/');
+    cy.createProject(testName);
   });
 
   beforeEach(() => {
@@ -71,6 +72,10 @@ describe('Validate root disk', () => {
     cy.byButtonText('Cancel').click();
   });
 
+  after(() => {
+    cy.deleteTestProject(testName);
+  });
+
   it('ID(CNV-5469) Blank disk cannot be used as bootdisk', () => {
     addDisk(blankDisk);
     checkDiskBootable(blankDisk.name, false);
diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/regression/validate-nad-for-pxe.spec.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/regression/validate-nad-for-pxe.spec.ts
index 6774a9b0ff4..d102ffa6b94 100644
--- a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/regression/validate-nad-for-pxe.spec.ts
+++ b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/regression/validate-nad-for-pxe.spec.ts
@@ -17,9 +17,14 @@ describe('Validate NAD for PXE provision source', () => {
   before(() => {
     cy.Login();
     cy.visit('/');
+    cy.createProject(testName);
     cy.visitVMsList();
   });
 
+  after(() => {
+    cy.deleteTestProject(testName);
+  });
+
   it('ID(CNV-5045) Verify PXE provision source must have NAD available', () => {
     wizard.vm.open();
     wizard.vm.selectTemplate(vmData);
diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/template-rhel9.spec.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/template-rhel9.spec.ts
index 8405c0523b5..16e298a86c0 100644
--- a/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/template-rhel9.spec.ts
+++ b/frontend/packages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/template-rhel9.spec.ts
@@ -1,3 +1,4 @@
+import { testName } from '../../support';
 import { TEMPLATE } from '../../utils/const/index';
 import { unStarIcon, supportLevel, supportLevelTag } from '../../views/selector';
 
@@ -7,10 +8,15 @@ describe('Test RHEL9 template', () => {
   before(() => {
     cy.Login();
     cy.visit('/');
+    cy.createProject(testName);
     cy.visitVMTemplatesList();
     cy.filterByName(template.dvName);
   });
 
+  after(() => {
+    cy.deleteTestProject(testName);
+  });
+
   // TODO: RHEL9 should be starred after it's official released.
   it('ID(CNV-7185) Verify RHEL9 template is not starred', () => {
     // mark it downstream only as upstream has no rhel9 template yet
diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/selector-wizard.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/selector-wizard.ts
index a3efa7b5170..749807cb1c6 100644
--- a/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/selector-wizard.ts
+++ b/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/selector-wizard.ts
@@ -60,3 +60,6 @@ export const selectBootSource = 'select[id="storage-bootsource"]';
 export const rootdisk = '[data-id="rootdisk"]';
 export const kebabBtn = '[data-test-id="kebab-button"]';
 export const deleteBtn = '[data-test-action="Delete"]';
+
+// review step
+export const bootSource = '#wizard-review-provision_source_type';
diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/wizard.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/wizard.ts
index b72b6306468..11d5330a362 100644
--- a/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/wizard.ts
+++ b/frontend/packages/kubevirt-plugin/integration-tests-cypress/views/wizard.ts
@@ -222,7 +222,13 @@ export const wizard = {
       cy.get(wizardView.nextBtn).click();
     },
     fillConfirmForm: (vmData: VirtualMachineData) => {
-      const { startOnCreation } = vmData;
+      const { provisionSource, startOnCreation } = vmData;
+
+      // enhancement for https://issues.redhat.com/browse/CNV-5162
+      if (provisionSource === ProvisionSource.URL) {
+        cy.get(wizardView.bootSource).should('contain', provisionSource.getSource());
+      }
+
       cy.get('body').then(($body) => {
         if ($body.find(wizardView.startOnCreation).length) {
           if (!startOnCreation) {