Align test classes and structure

libs/ui-lib-tests/cypress/integration/storage/storage-step-disk-holders.cy.ts

@@ -1,9 +1,9 @@
 import { commonActions } from '../../views/common';
 import { ValidateDiskHoldersParams, hostsTableSection } from '../../views/hostsTableSection';
-import { StoragePage } from '../../views/pages/StoragePage';
+import { StorageForm } from '../../views/forms/Storage/StorageForm';
 
 describe(`Assisted Installer Storage Step`, () => {
-  let storagePage;
+  let storageForm;
   const disks = [
     { name: 'vda' },
     { name: 'vdb' },
@@ -39,21 +39,21 @@ describe(`Assisted Installer Storage Step`, () => {
       commonActions.visitClusterDetailsPage();
       commonActions.startAtWizardStep('Storage');
 
-      storagePage = new StoragePage();
+      storageForm = new StorageForm();
     });
 
     it('Should display the correct alerts', () => {
-      storagePage.diskLimitationAlert.title.should(
+      storageForm.diskLimitationAlert.title.should(
         'contain.text',
         'Warning alert:Installation disk limitations',
       );
 
-      storagePage.diskLimitationAlert.description.find('li').then(($res) => {
+      storageForm.diskLimitationAlert.description.find('li').then(($res) => {
         expect($res).to.have.length(3);
         warningTexts.forEach((text, index) => expect($res[index]).to.contain(text));
       });
 
-      storagePage.diskFormattingAlert.title.should(
+      storageForm.diskFormattingAlert.title.should(
         'contain.text',
         'Warning alert:All bootable disks, except for read-only disks, will be formatted during installation. Make sure to back up any critical data before proceeding.',
       );

libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/with-mce-operator.cy.ts

@@ -1,5 +1,5 @@
 import { commonActions } from '../../../views/common';
-import OperatorsForm from '../../../views/forms/OperatorsForm';
+import OperatorsForm from '../../../views/forms/Operators/OperatorsForm';
 
 describe(`Create cluster with mce operator enabled`, () => {
   const setTestStartSignal = (activeSignal: string) => {

libs/ui-lib-tests/cypress/views/forms/Storage/StorageForm.ts

@@ -0,0 +1,18 @@
+import { Alert } from '../../reusableComponents/Alert';
+
+export class StorageForm {
+  static readonly alias = `@${StorageForm.name}`;
+  static readonly selector = '.pf-c-wizard__main-body';
+
+  constructor() {
+    cy.findWithinOrGet(StorageForm.selector).as(StorageForm.name);
+  }
+
+  get diskLimitationAlert() {
+    return new Alert(StorageForm.alias, '[data-testid="diskLimitationsAlert"]');
+  }
+
+  get diskFormattingAlert() {
+    return new Alert(StorageForm.alias, '[data-testid="alert-format-bootable-disks"]');
+  }
+}

libs/ui-lib-tests/cypress/views/reusableComponents/Alert.ts

@@ -0,0 +1,20 @@
+export class Alert {
+  static readonly alias = `@${Alert.name}`;
+  static readonly selector = '.pf-c-alert';
+
+  constructor(parentAlias: string, id: string = Alert.selector) {
+    cy.findWithinOrGet(id, parentAlias).as(Alert.name);
+  }
+
+  get body() {
+    return cy.get(Alert.alias);
+  }
+
+  get title() {
+    return this.body.find('.pf-c-alert__title');
+  }
+
+  get description() {
+    return this.body.find('.pf-c-alert__description');
+  }
+}