Skip to content

Commit 75de197

Browse files
committed
feat: expose within/getQueriesForElement
BREAKING CHANGE: rename extendObjectWithTestingUtils to getQueriesForElement
1 parent 22c4cce commit 75de197

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

lib/extend.ts

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
import {Matcher, MatcherOptions, SelectorMatcherOptions} from 'dom-testing-library/typings' // tslint:disable-line no-submodule-imports
2-
import {extendObjectWithTestingUtils, getDocument} from '.'
2+
import {getQueriesForElement, getDocument} from '.'
33

4-
const Page = require('puppeteer/lib/Page.js') // tslint:disable-line
5-
const ElementHandle = require('puppeteer/lib/ElementHandle.js') // tslint:disable-line
4+
let Page, ElementHandle
65

7-
Page.prototype.getDocument = getDocument
6+
try {
7+
Page = require('puppeteer/lib/Page.js') // tslint:disable-line
8+
ElementHandle = require('puppeteer/lib/ElementHandle.js') // tslint:disable-line
89

9-
extendObjectWithTestingUtils(ElementHandle.prototype)
10+
Page.prototype.getDocument = getDocument
11+
getQueriesForElement(ElementHandle.prototype)
12+
} catch (err) {
13+
console.error('Could not augment puppeteer functions, do you have a conflicting version?')
14+
throw err
15+
}
1016

1117
/* tslint:disable */
1218
declare module 'puppeteer' {

lib/index.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export async function getDocument(_page?: Page): Promise<ElementHandle> {
8484
return document
8585
}
8686

87-
export function extendObjectWithTestingUtils<T>(object: T, contextFn?: ContextFn): T & ITestUtils {
87+
export function getQueriesForElement<T>(object: T, contextFn?: ContextFn): T & ITestUtils {
8888
const o = object as any
8989
o.queryByPlaceholderText = createDelegateFor('queryByPlaceholderText', contextFn)
9090
o.queryAllByPlaceholderText = createDelegateFor('queryAllByPlaceholderText', contextFn)
@@ -113,6 +113,8 @@ export function extendObjectWithTestingUtils<T>(object: T, contextFn?: ContextFn
113113
return o
114114
}
115115

116+
export const within = getQueriesForElement
117+
116118
// @ts-ignore
117119
export const queries: ITestUtils = {}
118-
extendObjectWithTestingUtils(queries, el => el)
120+
getQueriesForElement(queries, el => el)

0 commit comments

Comments
 (0)