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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how

## [0.0.19]
- :rocket: added to match value wait
- :rocket: added in viewport validation

## [0.0.18]
- :rocket: added interceptor steps
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"homepage": "https://github.com/qavajs/steps-playwright#readme",
"devDependencies": {
"@cucumber/cucumber": "^9.1.0",
"@qavajs/cli": "^0.0.20",
"@qavajs/cli": "^0.0.21",
"@qavajs/console-formatter": "^0.2.1",
"@qavajs/memory": "^1.2.1",
"@qavajs/po-playwright": "^0.0.8",
Expand Down
16 changes: 14 additions & 2 deletions src/conditionWait.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { Locator } from "playwright";
import { Locator } from 'playwright';
import { expect } from '@playwright/test';
import {throwTimeoutError} from './utils/utils';

export const conditionValidations = {
PRESENT: 'present',
// CLICKABLE: 'clickable',
VISIBLE: 'visible',
INVISIBLE: 'invisible',
IN_VIEWPORT: 'in viewport',
// ENABLED: 'enabled',
// DISABLED: 'disabled'
}
Expand Down Expand Up @@ -34,7 +37,16 @@ const waits = {
reverse: boolean,
timeout: number,
timeoutMsg: string
) => element.waitFor({state: reverse ? 'visible' : 'hidden', timeout})
) => element.waitFor({state: reverse ? 'visible' : 'hidden', timeout}),
[conditionValidations.IN_VIEWPORT]: (
element: Locator,
reverse: boolean,
timeout: number,
timeoutMsg: string
) => throwTimeoutError(() => expect(async () => {
const e = reverse ? expect(element).not : expect(element);
await e.toBeInViewport();
}).toPass({ timeout }), timeoutMsg)
}
/**
* Wait for condition
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defineParameterType({

defineParameterType({
name: 'playwrightConditionWait',
regexp: /((not )?to (?:be )?(present|clickable|visible|invisible|enabled|disabled))/,
regexp: /((not )?to (?:be )?(present|clickable|visible|invisible|enabled|disabled|in viewport))/,
transformer: p => p,
useForSnippets: false
});
Expand Down
20 changes: 16 additions & 4 deletions src/utils/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ScreenshotEvent } from './screenshotEvent';
import { TraceEvent } from './traceEvent';
import { Status, ITestStepHookParameter, ITestCaseHookParameter } from '@cucumber/cucumber';
import { join } from 'path';
import {ScreenshotEvent} from './screenshotEvent';
import {TraceEvent} from './traceEvent';
import {Status, ITestStepHookParameter, ITestCaseHookParameter} from '@cucumber/cucumber';
import {join} from 'path';

export function saveScreenshotAfterStep(config: any, step: ITestStepHookParameter): boolean {
const isAfterStepScreenshot = equalOrIncludes(config.screenshot, ScreenshotEvent.AFTER_STEP);
Expand Down Expand Up @@ -45,3 +45,15 @@ export function equalOrIncludes(value: string | string[], argument: string) {
? value.includes(argument)
: value === argument;
}

export async function throwTimeoutError(fn: Function, message: string) {
try {
await fn()
} catch (err: any) {
if (err.message.includes('exceeded while waiting on the predicate')) {
throw new Error(message);
}
throw err
}

}
6 changes: 3 additions & 3 deletions src/validations.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Then} from '@cucumber/cucumber';
import {getValue, getElement, getConditionWait} from './transformers';
import {getValidation} from '@qavajs/validation';
import { Then } from '@cucumber/cucumber';
import { getValue, getElement, getConditionWait } from './transformers';
import { getValidation } from '@qavajs/validation';

/**
* Verify element condition
Expand Down
1 change: 1 addition & 0 deletions test-e2e/features/waits.feature
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Feature: waits
| Detach Element | not to be present |
| Visible Element | to be visible |
| Hidden Element | to be invisible |
| Visible Element | to be in viewport |

Scenario Outline: wait for text (<condition>)
Then I wait until text of 'Loading' <condition> '<expectation>'
Expand Down