Refactored classes and specs

VadimNastoyashchy · Dec 8, 2022 · f81180c · f81180c
1 parent c9425c2
commit f81180c
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 32 deletions.
diff --git a/config/wdio-android.conf.ts b/config/wdio-android.conf.ts
@@ -15,7 +15,7 @@ exports.config = {
     // ====================
     //
     port: 4723,
-    specs: [],
+    specs: ["./test/specs/android/*.ts"],
     // Patterns to exclude.
     exclude: [],
     //
@@ -25,23 +25,22 @@ exports.config = {
     //
     maxInstances: 2,
     capabilities: [
+        // {
+        //     platformName: "Android",
+        //     maxInstances: 1,
+        //     specs: ["./test/specs/android/logIn_problem.ts"],
+        //     "appium:avd": "Pixel_3_API_29",
+        //     "appium:deviceName": "Pixel_3_10.0",
+        //     "appium:platformVersion": "10.0",
+        //     "appium:orientation": "PORTRAIT",
+        //     "appium:automationName": "UiAutomator2",
+        //     "appium:app": join(process.cwd(), "./app/Android.SauceLabs.Mobile.Sample.app.2.7.1.apk"),
+        //     "appium:appWaitActivity": "com.swaglabsmobileapp.MainActivity",
+        //     "appium:newCommandTimeout": 240,
+        // },
         {
             platformName: "Android",
             maxInstances: 1,
-            specs: ["./test/specs/android/logIn_problem.ts"],
-            "appium:avd": "Pixel_3_API_29",
-            "appium:deviceName": "Pixel_3_10.0",
-            "appium:platformVersion": "10.0",
-            "appium:orientation": "PORTRAIT",
-            "appium:automationName": "UiAutomator2",
-            "appium:app": join(process.cwd(), "./app/Android.SauceLabs.Mobile.Sample.app.2.7.1.apk"),
-            "appium:appWaitActivity": "com.swaglabsmobileapp.MainActivity",
-            "appium:newCommandTimeout": 240,
-        },
-        {
-            platformName: "Android",
-            maxInstances: 1,
-            specs: ["./test/specs/android/logIn_standard.ts"],
             "appium:avd": "Pixel_XL_API_29",
             "appium:deviceName": "Pixel_XL_10.0",
             "appium:platformVersion": "10.0",

diff --git a/src/components/HeaderComponent.ts b/src/components/HeaderComponent.ts
@@ -0,0 +1,8 @@
+
+export default class HeaderComponent {
+
+    public get productsTitle() {
+        return $("//*[@text=\"PRODUCTS\"]");
+    }
+
+}
diff --git a/src/pages/InventoryPage.ts b/src/pages/InventoryPage.ts
@@ -0,0 +1,7 @@
+import HeaderComponent from "../components/HeaderComponent";
+
+export default class InventoryPage {
+
+    public header = new HeaderComponent();
+
+}
diff --git a/src/pages/LoginPage.ts b/src/pages/LoginPage.ts
@@ -1,6 +1,6 @@
 import ICredentials from "../interfaces/ICredentials";
 
-class Login {
+export default class LoginPage {
 
     private get inputEmail() {
         return $("~test-Username");
@@ -11,7 +11,7 @@ class Login {
     }
 
     private get logInButton() {
-        return $("//android.view.ViewGroup[@content-desc=\"test-LOGIN\"]/android.widget.TextView");
+        return $("//*[@text=\"LOGIN\"]");
     }
 
     private async enterEmail(userName: string) {
@@ -26,12 +26,9 @@ class Login {
         await this.logInButton.click();
     }
 
-    public async logInWithCredentials(credentials: ICredentials): Promise<void> {
-        const {userName, password} = credentials;
+    public async logInWithCredentials({ userName, password }: ICredentials) {
         await this.enterEmail(userName);
         await this.enterPassword(password);
         await this.clickOnLogInButton();
     }
-}
-
-export const LoginPage = new Login();
+}
diff --git a/test/specs/android/logIn_problem.ts b/test/specs/android/logIn_problem.ts
@@ -1,12 +1,14 @@
+import LoginPage from "../../../src/pages/LoginPage";
 import Credentials from "../../../src/Credentials";
-import {AccountType} from "../../../src/AccountType";
-import {LoginPage} from "../../../src/pages/LoginPage";
+import { AccountType } from "../../../src/AccountType";
+import InventoryPage from "../../../src/pages/InventoryPage";
 
 describe("Log in tests", () => {
 
     it("Log in as \"problem_user\"", async () => {
-        await LoginPage.logInWithCredentials(Credentials.getUserCredentials(AccountType.Problem));
-        const headerText = await $("//*[@text=\"PRODUCTS\"]");
-        await expect(await headerText.getText()).toEqual("PRODUCTS");
+        const loginPage = new LoginPage();
+        const inventoryPage = new InventoryPage();
+        await loginPage.logInWithCredentials(Credentials.getUserCredentials(AccountType.Problem));
+        await expect(await inventoryPage.header.productsTitle.getText()).toEqual("PRODUCTS");
     });
 });
diff --git a/test/specs/android/logIn_standard.ts b/test/specs/android/logIn_standard.ts
@@ -1,12 +1,14 @@
+import LoginPage from "../../../src/pages/LoginPage";
+import InventoryPage from "../../../src/pages/InventoryPage";
 import Credentials from "../../../src/Credentials";
-import {AccountType} from "../../../src/AccountType";
-import {LoginPage} from "../../../src/pages/LoginPage";
+import { AccountType } from "../../../src/AccountType";
 
 describe("Log in tests", () => {
 
     it("Log in as \"standard_user\"", async () => {
-        await LoginPage.logInWithCredentials(Credentials.getUserCredentials(AccountType.Standard));
-        const headerText = await $("//*[@text=\"PRODUCTS\"]");
-        await expect(await headerText.getText()).toEqual("PRODUCTS");
+        const loginPage = new LoginPage();
+        const inventoryPage = new InventoryPage();
+        await loginPage.logInWithCredentials(Credentials.getUserCredentials(AccountType.Standard));
+        await expect(await inventoryPage.header.productsTitle.getText()).toEqual("PRODUCTS");
     });
 });