Improved interfaces

src/common/BO/loginBO.ts

@@ -1,6 +1,6 @@
 //import testContext from '@utils/testContext';
 
-import loginPage from '@pages/BO/login';
+let loginPage = require('@pages/BO/login');
 import dashboardPage from '@pages/BO/dashboard';
 
 import {expect} from '@playwright/test';
@@ -15,7 +15,10 @@ export default {
   ): Promise<void> {
     //await testContext.addContextItem(testInfo, 'testIdentifier', 'loginBO');
 
-    //await loginPage.goTo(page, global.BO.URL);
+    console.log(loginPage);
+    console.log(loginPage.goTo);
+
+    await loginPage.goTo(page, global.BO.URL);
     await loginPage.successLogin(page, email, password);
 
     const pageTitle = await dashboardPage.getPageTitle(page);

src/interfaces/BO/dashboard/index.ts

@@ -1,3 +1,5 @@
-export interface DashboardPageInterface {
+import { BOBasePagePageInterface } from "@interfaces/BO";
+
+export interface DashboardPageInterface extends BOBasePagePageInterface {
     readonly pageTitle: string;
 }

src/interfaces/BO/index.ts

@@ -0,0 +1,6 @@
+import type { CommonPageInterface } from "@interfaces/index";
+import type { Page } from "@playwright/test";
+
+export interface BOBasePagePageInterface extends CommonPageInterface {
+    logoutBO(page: Page): Promise<void>;
+}

src/interfaces/BO/login/index.ts

@@ -1,6 +1,9 @@
+import { BOBasePagePageInterface } from "@interfaces/BO";
+
 import type {Page} from '@playwright/test';
 
-export interface LoginPageInterface {
+
+export interface LoginPageInterface extends BOBasePagePageInterface {
     readonly pageTitle: string;
 
     successLogin(page: Page, email: string, password: string): Promise<void>;

src/interfaces/index.ts

@@ -0,0 +1,7 @@
+import type { Page } from "@playwright/test";
+
+export interface CommonPageInterface {
+    getPageTitle(page: Page): Promise<string>;
+
+    goTo(page: Page, url: string): Promise<void>;
+}

src/pages/BO/dashboard/index.ts

@@ -1,11 +1,12 @@
+import type { DashboardPageInterface } from '@interfaces/BO/dashboard';
 import semver from 'semver';
 
 const psVersion = process.env.PS_VERSION ?? '99.99.99';
 
-let Dashboard: any;
+let Dashboard: DashboardPageInterface;
 if (semver.gte(psVersion, '8.0.0')) {
   Dashboard = require('@versions/8.0.0/pages/BO/dashboard');
 } else {
   Dashboard = require('@versions/8.0.0/pages/BO/dashboard');
 }
-export default Dashboard.constructor();
+export default Dashboard;

src/pages/BO/login/index.ts

@@ -1,11 +1,12 @@
+import type { LoginPageInterface } from '@interfaces/BO/login';
 import semver from 'semver';
 
 const psVersion = process.env.PS_VERSION ?? '99.99.99';
 
-let Login: any;
-if (semver.gte(psVersion, '8.0.0')) {=
+let Login: LoginPageInterface;
+if (semver.gte(psVersion, '8.0.0')) {
   Login = require('@versions/8.0.0/pages/BO/login');
 } else {
   Login = require('@versions/8.0.0/pages/BO/login');
 }
-export default Login.constructor();
+export default Login;

src/versions/8.0.0/pages/BO/dashboard/index.ts

@@ -9,7 +9,7 @@ import {DashboardPageInterface} from '@interfaces/BO/dashboard';
  * @class
  * @extends BOBasePage
  */
-export default class Dashboard extends BOBasePage implements DashboardPageInterface {
+class Dashboard extends BOBasePage implements DashboardPageInterface {
   public readonly pageTitle: string;
 
   private readonly demoModeButton: string;
@@ -624,3 +624,5 @@ export default class Dashboard extends BOBasePage implements DashboardPageInterf
     return this.getTextContent(page, this.helpCardDocumentTitle);
   }
 }
+
+export default new Dashboard();

src/versions/8.0.0/pages/BO/login/index.ts

@@ -9,7 +9,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends BOBasePage
  */
-export default class Login extends BOBasePage implements LoginPageInterface {
+class Login extends BOBasePage implements LoginPageInterface {
   public readonly pageTitle: string;
 
   public readonly loginErrorText: string;
@@ -183,3 +183,5 @@ export default class Login extends BOBasePage implements LoginPageInterface {
     return this.getTextContent(page, this.resetPasswordSuccessConfirmationText);
   }
 }
+
+export default new Login();