added capability to pass pageObject property as object

Author: Oleksandr_Halichenko

CHANGELOG.md

@@ -10,6 +10,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 :pencil: - chore  
 :microscope: - experimental
 
+## [2.3.1]
+- :rocket: added capability to pass `pageObject` property as object
+- :beetle: fixed simple equal title
+
 ## [2.3.0]
 - :beetle: fixed publishing workflow
 - :rocket: added `locator.as` method to define top level components (like pages)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@qavajs/playwright",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "steps to interact with playwright",
   "main": "./index.js",
   "scripts": {
@@ -25,15 +25,15 @@
   },
   "homepage": "https://github.com/qavajs/playwright#readme",
   "devDependencies": {
-    "@cucumber/cucumber": "^11.1.1",
+    "@cucumber/cucumber": "^11.2.0",
     "@qavajs/memory": "^1.10.2",
-    "@qavajs/playwright-runner-adapter": "^1.0.1",
+    "@qavajs/playwright-runner-adapter": "^1.2.0",
     "@types/express": "^5.0.0",
-    "@types/node": "^22.10.5",
-    "electron": "^33.3.1",
+    "@types/node": "^22.10.6",
+    "electron": "^34.0.0",
     "express": "^4.21.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.3"
   },
   "dependencies": {
     "@playwright/test": "^1.49.1"

package.json

@@ -165,7 +165,7 @@ When('I hover over {locator}', async function (locator: Locator) {
  * @example I select '$dateOfBirth' option from 'Registration Form > Date Of Birth' dropdown
  */
 When('I select {value} option from {locator} dropdown', async function (option: MemoryValue, select: Locator) {
-    await select.selectOption({ label: await option.value()});
+    await select.selectOption({ label: await option.value() });
 });
 
 /**

src/actions.ts

@@ -2,7 +2,7 @@ import { DataTable, When } from '@cucumber/cucumber';
 import { dataTable2Object } from './utils/utils';
 import { QavajsPlaywrightWorld } from './QavajsPlaywrightWorld';
 import { Locator } from '@playwright/test';
-import {MemoryValue} from "./types";
+import { MemoryValue } from './types';
 
 /**
  * Save text of element to memory

src/memory.ts

@@ -93,7 +93,7 @@ export class ChainItem {
 export function query(root: any, path: string) {
     const elements = path.split(/\s*>\s*/);
     const tokens = [];
-    let currentComponent = new root();
+    let currentComponent = typeof root === 'function' ? new root() : root;
     let currentAlias = 'page object root';
     for (const element of elements) {
         const groups = element.match(/^(?<alias>.+?)(?:\((?<argument>.+)\))?$/)?.groups as { alias: string, argument: string };

src/pageObject.ts

@@ -13,5 +13,6 @@ import { locator } from './pageObject';
 When('I define {value} as {value} locator', async function (selectorKey: MemoryValue, aliasKey: MemoryValue) {
     const selector = await selectorKey.value();
     const alias = (await aliasKey.value()).replace(/\s/g, '');
-    this.config.pageObject.prototype[alias] = locator(selector);
+    const pageObjectRef = this.config.pageObject.prototype ?? this.config.pageObject;
+    pageObjectRef[alias] = locator(selector);
 });

src/poDefine.ts

@@ -4,36 +4,19 @@ export const expect = base.extend({
     toSimpleEqual(actual: any, expected: any) {
         const name = 'to equal';
         const pass = actual == expected;
-        if (pass) {
-            return {
-                expected,
-                actual,
-                name,
-                message: () => `expected ${this.utils.printExpected(actual)} not to equal ${this.utils.printReceived(expected)}`,
-                pass: true,
-            };
-        } else {
-            return {
-                expected,
-                actual,
-                name,
-                message: () => `expected ${this.utils.printExpected(actual)} to equal ${this.utils.printReceived(expected)}`,
-                pass: false,
-            };
-        }
+        return {
+            expected,
+            actual,
+            name,
+            message: () => `expected ${this.utils.printExpected(actual)} ${pass ? 'not ': ''}to equal ${this.utils.printReceived(expected)}`,
+            pass,
+        };
     },
     toHaveType(actual: any, expected: string) {
         const pass = typeof actual == expected;
-        if (pass) {
-            return {
-                message: () => `expected ${actual} to have type ${this.utils.printExpected(expected)}`,
-                pass: true,
-            };
-        } else {
-            return {
-                message: () => `expected ${actual} not to have type ${this.utils.printReceived(expected)}`,
-                pass: false,
-            };
+        return {
+            message: () => `expected ${actual} ${pass ? 'not ': ''}to have type ${this.utils.printReceived(expected)}`,
+            pass
         }
     },
 });
@@ -66,8 +49,8 @@ const aboveFn = (expectClause: any, ER: any) =>
 const belowFn = (expectClause: any, ER: any) =>
     (expected: any, actual: any, reverse: boolean, poll: boolean) => expectValue(expected, reverse, poll).toBeLessThan(toNumber(actual));
 
-function expectValue(expected: any, reverse: boolean, poll: boolean) {
-    const expectClause = poll ? expect.poll(expected) : expect(expected);
+function expectValue(expected: any, reverse: boolean, poll: boolean, message?: string) {
+    const expectClause = poll ? expect.poll(expected, message) : expect(expected, message);
     return reverse ? expectClause.not : expectClause;
 }
 
@@ -86,7 +69,7 @@ function toRegexp(r: string | RegExp): RegExp {
 const expects = {
     [validations.EQUAL]:
         //@ts-ignore
-        (expected: any, actual: any, reverse: boolean, poll: boolean) => expectValue(expected, reverse, poll).toSimpleEqual(actual),
+        (expected: any, actual: any, reverse: boolean, poll: boolean) => expectValue(expected, reverse, poll, 'expect.toEqual').toSimpleEqual(actual),
     [validations.STRICTLY_EQUAL]:
         (expected: any, actual: any, reverse: boolean, poll: boolean) => expectValue(expected, reverse, poll).toEqual(actual),
     [validations.DEEPLY_EQUAL]:

src/validationExpect.ts

@@ -8,7 +8,7 @@ export default {
         'test-e2e/step_definitions/*.ts'
     ],
     memory: new Memory(),
-    pageObject: App
+    pageObject: new App()
 }
 
 export const electron = {
@@ -19,5 +19,5 @@ export const electron = {
         'test-e2e/step_definitions/*.ts'
     ],
     memory: new Memory(),
-    pageObject: App
+    pageObject: new App()
 }