Put InstallActor in every test

jknphy · Oct 17, 2023 · 3c51bef · 3c51bef
1 parent 946dbde
commit 3c51bef
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 100 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/add-home-file-system.spec.ts b/tests/add-home-file-system.spec.ts
@@ -5,6 +5,7 @@ import { UserActor } from "../actors/user-actor";
 import { MainPage } from '../pages/main-page';
 import { ProductSelectionOpensusePage } from '../pages/product-selection-opensuse-page';
 import { StoragePage } from '../pages/storage-page';
+import { InstallActor } from '../actors/install-actor';
 
 const minute = 60 * 1000;
 test.describe('The main page', () => {
@@ -20,39 +21,24 @@ test.describe('The main page', () => {
         const mainPage = new MainPage(page);
         await test.step("Start to add home file system", async () => {
             await mainPage.accessStorage();
-        
+
             const storagePage = new StoragePage(page);
             await storagePage.accessAddFileSystem();
             const addFileSystemPage = new AddFileSystemPage(page);
             await addFileSystemPage.accept();
             await storagePage.back();
-      
+
         });
 
         await test.step("set mandatory user and root password", async () => {
             await mainPage.accessUsers();
             await (new UserActor(page)).handleUser();
         });
-    
+
         await test.step("Run installation", async () => {
             test.setTimeout(30 * minute);
-            // start the installation
-            await expect(page.getByText("Installation will take")).toBeVisible({ timeout: 2 * minute });
-            await page.getByRole("button", { name: "Install", exact: true }).click();
-            await expect(page.getByText("Confirm Installation")).toBeVisible({ timeout: 2 * minute });
-            await page.getByRole("button", { name: "Continue" }).click();
-            // wait for the package installation progress
-            await expect(page.getByText("Installing packages")).toBeVisible({ timeout: 8 * minute });
-            while (true) {
-                try {
-                    await page.getByRole("heading", { name: "Congratulations!" }).waitFor({ timeout: minute / 2 });
-                    break;
-                }
-                catch (error) {
-                    // do not ignore other errors
-                    if (error.constructor.name !== "TimeoutError") throw (error);
-                }
-            }
-        });
+            const installActor = new InstallActor(page, mainPage);
+            await installActor.handleInstallation();
+        })
     });
 });
diff --git a/tests/default_installation.spec.ts b/tests/default_installation.spec.ts
@@ -3,6 +3,7 @@ import { IndexActor } from "../actors/index-actor";
 import { UserActor } from "../actors/user-actor";
 import { MainPage } from '../pages/main-page';
 import { ProductSelectionOpensusePage } from '../pages/product-selection-opensuse-page';
+import { InstallActor } from '../actors/install-actor';
 
 const minute = 60 * 1000;
 test.describe('The main page', () => {
@@ -14,7 +15,7 @@ test.describe('The main page', () => {
         indexActor.handleProductSelectionIfAny();
     });
 
-      test('Default installation test', async ({ page }) => {
+    test('Default installation test', async ({ page }) => {
         const mainPage = new MainPage(page);
         await test.step("set mandatory user and root password", async () => {
             await mainPage.accessUsers();
@@ -24,23 +25,8 @@ test.describe('The main page', () => {
         //Installation
         await test.step("Run installation", async () => {
             test.setTimeout(30 * minute);
-            // start the installation
-            await expect(page.getByText("Installation will take")).toBeVisible({ timeout: 2 * minute });
-            await mainPage.install();
-            await expect(page.getByText("Confirm Installation")).toBeVisible({ timeout: 2 * minute });
-            await page.getByRole("button", { name: "Continue" }).click();
-            // wait for the package installation progress
-            await expect(page.getByText("Installing packages")).toBeVisible({ timeout: 8 * minute });
-            while (true) {
-                try {
-                    await page.getByRole("heading", { name: "Congratulations!" }).waitFor({ timeout: minute / 2 });
-                    break;
-                }
-                catch (error) {
-                    // do not ignore other errors
-                    if (error.constructor.name !== "TimeoutError") throw (error);
-                }
-            }
-      });
+            const installActor = new InstallActor(page, mainPage);
+            await installActor.handleInstallation();
+        })
     });
 });
diff --git a/tests/encrypted_lvm.spec.ts b/tests/encrypted_lvm.spec.ts
@@ -5,6 +5,7 @@ import { StoragePage } from '../pages/storage-page';
 import { MainPage } from '../pages/main-page';
 import { ProductSelectionOpensusePage } from '../pages/product-selection-opensuse-page';
 import { EncryptionPasswordPopup } from '../pages/encryption-password-popup';
+import { InstallActor } from '../actors/install-actor';
 
 const minute = 60 * 1000;
 test.describe('The main page', () => {
@@ -16,7 +17,7 @@ test.describe('The main page', () => {
         indexActor.handleProductSelectionIfAny();
     });
 
-      test('Installation test with encrypted lvm file system', async ({ page }) => {
+    test('Installation test with encrypted lvm file system', async ({ page }) => {
         const mainPage = new MainPage(page);
         await test.step("set encrypted lvm file system", async () => {
             await mainPage.accessStorage();
@@ -43,23 +44,8 @@ test.describe('The main page', () => {
         //Installation
         await test.step("Run installation", async () => {
             test.setTimeout(30 * minute);
-            // start the installation
-            await expect(page.getByText("Installation will take")).toBeVisible({ timeout: 2 * minute });
-            await mainPage.install();
-            await expect(page.getByText("Confirm Installation")).toBeVisible({ timeout: 2 * minute });
-            await page.getByRole("button", { name: "Continue" }).click();
-            // wait for the package installation progress
-            await expect(page.getByText("Installing packages")).toBeVisible({ timeout: 8 * minute });
-            while (true) {
-                try {
-                    await page.getByRole("heading", { name: "Congratulations!" }).waitFor({ timeout: minute / 2 });
-                    break;
-                }
-                catch (error) {
-                    // do not ignore other errors
-                    if (error.constructor.name !== "TimeoutError") throw (error);
-                }
-            }
-      });
+            const installActor = new InstallActor(page, mainPage);
+            await installActor.handleInstallation();
+        })
     });
 });
diff --git a/tests/full-disk-encryption.spec.ts b/tests/full-disk-encryption.spec.ts
@@ -17,7 +17,7 @@ test.describe('The main page', () => {
         indexActor.handleProductSelectionIfAny();
     });
 
-      test('Full-disk encryption', async ({ page }) => {
+    test('Full-disk encryption', async ({ page }) => {
         const mainPage = new MainPage(page);
         await test.step("Set for Full-disk encryption", async () => {
             await mainPage.accessStorage();

diff --git a/tests/lvm.spec.ts b/tests/lvm.spec.ts
@@ -4,6 +4,7 @@ import { UserActor } from "../actors/user-actor";
 import { ProductSelectionOpensusePage } from '../pages/product-selection-opensuse-page';
 import { MainPage } from '../pages/main-page';
 import { StoragePage } from '../pages/storage-page';
+import { InstallActor } from '../actors/install-actor';
 
 const minute = 60 * 1000;
 test.describe('The main page', () => {
@@ -15,7 +16,7 @@ test.describe('The main page', () => {
         indexActor.handleProductSelectionIfAny();
     });
 
-      test("Use logical volume management (LVM) as storage device for installation", async ({ page }) => {
+    test("Use logical volume management (LVM) as storage device for installation", async ({ page }) => {
         const mainPage = new MainPage(page);
         await test.step("Set LVM and Users", async () => {
             await mainPage.accessStorage();
@@ -31,25 +32,10 @@ test.describe('The main page', () => {
             await (new UserActor(page)).handleUser();
         });
 
-      await test.step("Run installation", async () => {
-        test.setTimeout(30 * minute);
-        // start the installation
-        await expect(page.getByText("Installation will take")).toBeVisible({ timeout: 2 * minute });
-        await mainPage.install();
-        await expect(page.getByText("Confirm Installation")).toBeVisible({ timeout: 2 * minute });
-        await page.getByRole("button", { name: "Continue" }).click();
-        // wait for the package installation progress
-        await expect(page.getByText("Installing packages")).toBeVisible({ timeout: 8 * minute });
-        while (true) {
-            try {
-                await page.getByRole("heading", { name: "Congratulations!" }).waitFor({ timeout: minute / 2 });
-                break;
-            }
-            catch (error) {
-                // do not ignore other errors
-                if (error.constructor.name !== "TimeoutError") throw (error);
-            }
-        }
-      });
+        await test.step("Run installation", async () => {
+            test.setTimeout(30 * minute);
+            const installActor = new InstallActor(page, mainPage);
+            await installActor.handleInstallation();
+        })
     });
 });
diff --git a/tests/select-install-device.spec.ts b/tests/select-install-device.spec.ts
@@ -5,6 +5,7 @@ import { StoragePage } from '../pages/storage-page';
 import { MainPage } from '../pages/main-page';
 import { ProductSelectionOpensusePage } from '../pages/product-selection-opensuse-page';
 import { InstallationDevicePage } from '../pages/install-device-page';
+import { InstallActor } from '../actors/install-actor';
 
 const minute = 60 * 1000;
 test.describe('The main page', () => {
@@ -16,7 +17,7 @@ test.describe('The main page', () => {
         indexActor.handleProductSelectionIfAny();
     });
 
-      test('Installation on second available storage device', async ({ page }) => {
+    test('Installation on second available storage device', async ({ page }) => {
         const mainPage = new MainPage(page);
         await test.step("select second available device for installation", async () => {
             const storagePage = new StoragePage(page);
@@ -39,23 +40,8 @@ test.describe('The main page', () => {
         //Installation
         await test.step("Run installation", async () => {
             test.setTimeout(30 * minute);
-            // start the installation
-            await expect(page.getByText("Installation will take")).toBeVisible({ timeout: 2 * minute });
-            await mainPage.install();
-            await expect(page.getByText("Confirm Installation")).toBeVisible({ timeout: 2 * minute });
-            await page.getByRole("button", { name: "Continue" }).click();
-            // wait for the package installation progress
-            await expect(page.getByText("Installing packages")).toBeVisible({ timeout: 8 * minute });
-            while (true) {
-                try {
-                    await page.getByRole("heading", { name: "Congratulations!" }).waitFor({ timeout: minute / 2 });
-                    break;
-                }
-                catch (error) {
-                    // do not ignore other errors
-                    if (error.constructor.name !== "TimeoutError") throw (error);
-                }
-            }
-      });
+            const installActor = new InstallActor(page, mainPage);
+            await installActor.handleInstallation();
+        })
     });
 });