Skip to content

Fix typedefs for role queries #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2021
Merged

Fix typedefs for role queries #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90da065
Fix typedefs for role queries
Hypnosphi Sep 3, 2021
ec4d204
Fix imports order
Hypnosphi Sep 6, 2021
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
24 changes: 8 additions & 16 deletions lib/typedefs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
ByRoleOptions as ByRoleOptions_,
Matcher,
MatcherOptions as MatcherOptions_,
SelectorMatcherOptions as SelectorMatcherOptions_,
Expand All @@ -10,16 +11,7 @@ type Element = ElementHandle

type MatcherOptions = Omit<MatcherOptions_, 'normalizer'>
type SelectorMatcherOptions = Omit<SelectorMatcherOptions_, 'normalizer'>

// tslint:disable-next-line
interface RoleMatcherOptions extends MatcherOptions {
name?: string | RegExp
}

// tslint:disable-next-line
interface SelectorRoleMatcherOptions extends SelectorMatcherOptions {
name?: string | RegExp
}
type ByRoleOptions = Omit<ByRoleOptions_, 'normalizer'>

interface IQueryMethods {
queryByPlaceholderText(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element | null>
Expand Down Expand Up @@ -124,20 +116,20 @@ interface IQueryMethods {
waitForOpts?: waitForOptions,
): Promise<Element[]>

queryByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element | null>
queryAllByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element[]>
getByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element>
getAllByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element[]>
queryByRole(el: Element, m: Matcher, opts?: ByRoleOptions): Promise<Element | null>
queryAllByRole(el: Element, m: Matcher, opts?: ByRoleOptions): Promise<Element[]>
getByRole(el: Element, m: Matcher, opts?: ByRoleOptions): Promise<Element>
getAllByRole(el: Element, m: Matcher, opts?: ByRoleOptions): Promise<Element[]>
findByRole(
el: Element,
m: Matcher,
opts?: SelectorRoleMatcherOptions,
opts?: ByRoleOptions,
waitForOpts?: waitForOptions,
): Promise<Element>
findAllByRole(
el: Element,
m: Matcher,
opts?: SelectorRoleMatcherOptions,
opts?: ByRoleOptions,
waitForOpts?: waitForOptions,
): Promise<Element[]>

Expand Down