Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
:pencil: - chore
:microscope: - experimental

## [Unreleased]
## [2.4.0]
- :rocket: added capability to pass timeout to function returned by `state` parameter type
- :rocket: added js maps

## [2.3.1]
Expand Down
80 changes: 32 additions & 48 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@qavajs/playwright",
"version": "2.3.1",
"version": "2.4.0",
"description": "steps to interact with playwright",
"main": "./index.js",
"scripts": {
Expand All @@ -27,15 +27,15 @@
"devDependencies": {
"@cucumber/cucumber": "^11.2.0",
"@qavajs/memory": "^1.10.2",
"@qavajs/playwright-runner-adapter": "^1.2.0",
"@qavajs/playwright-runner-adapter": "^1.3.0",
"@types/express": "^5.0.0",
"@types/node": "^22.10.6",
"electron": "^34.0.0",
"@types/node": "^22.13.10",
"electron": "^35.0.2",
"express": "^4.21.2",
"ts-node": "^10.9.2",
"typescript": "^5.7.3"
"typescript": "^5.8.2"
},
"dependencies": {
"@playwright/test": "^1.49.1"
"@playwright/test": "^1.51.1"
}
}
42 changes: 26 additions & 16 deletions src/conditionExpect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,55 @@ export const conditionWaitRegexp = new RegExp(`(${notClause}${toBeClause}${valid
function expectLocator(locator: Locator, reverse: boolean) {
return reverse ? expect(locator).not : expect(locator);
}

const expects = {
[conditionValidations.PRESENT]: async (
locator: Locator,
reverse: boolean
) => expectLocator(locator, reverse).toBeAttached(),
reverse: boolean,
options?: { timeout: number },
) => expectLocator(locator, reverse).toBeAttached(options),
[conditionValidations.VISIBLE]: (
locator: Locator,
reverse: boolean
) => expectLocator(locator, reverse).toBeVisible(),
reverse: boolean,
options?: { timeout: number }
) => expectLocator(locator, reverse).toBeVisible(options),
[conditionValidations.INVISIBLE]: (
locator: Locator,
reverse: boolean
) => expectLocator(locator, reverse).toBeHidden(),
reverse: boolean,
options?: { timeout: number }
) => expectLocator(locator, reverse).toBeHidden(options),
[conditionValidations.IN_VIEWPORT]: (
locator: Locator,
reverse: boolean
) => expectLocator(locator, reverse).toBeInViewport(),
reverse: boolean,
options?: { timeout: number }
) => expectLocator(locator, reverse).toBeInViewport(options),
[conditionValidations.ENABLED]: (
locator: Locator,
reverse: boolean
) => expectLocator(locator, reverse).toBeEnabled(),
reverse: boolean,
options?: { timeout: number }
) => expectLocator(locator, reverse).toBeEnabled(options),
[conditionValidations.DISABLED]: (
locator: Locator,
reverse: boolean
) => expectLocator(locator, reverse).toBeDisabled()
reverse: boolean,
options?: { timeout: number }
) => expectLocator(locator, reverse).toBeDisabled(options)
}

/**
* Wait for condition
* Wait for locator state
* @param {Locator} locator - locator
* @param condition
* @param options
* @return {Promise<void>}
*/
export async function conditionExpect(
locator: Locator,
condition: string
) {
condition: string,
options?: { timeout: number },
): Promise<void> {
const match = condition.match(conditionWaitExtractRegexp) as RegExpMatchArray;
if (!match) throw new Error(`${condition} expect is not implemented`);
const [_, reverse, validation] = match;
const expectFn = expects[validation];
await expectFn(locator, Boolean(reverse));
await expectFn(locator, Boolean(reverse), options);
}
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ export interface Validation {
poll: (AR: any, ER: any) => Promise<void>
}

export type StateValidation = (locator: Locator) => Promise<void>;
export type StateValidation = (locator: Locator, options?: { timeout: number }) => Promise<void>;
1 change: 0 additions & 1 deletion src/validations.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { DataTable, Then } from '@cucumber/cucumber';
import { Dialog, Locator } from '@playwright/test';
import { QavajsPlaywrightWorld } from './QavajsPlaywrightWorld';
import { valueExpect } from './validationExpect';
import { dataTable2Array } from './utils/utils';
import { MemoryValue, StateValidation, Validation } from './types';

Expand Down