Commit a1adc19

author

Andreas Reiser

committed

#1179: Specify default ontimeout at configuration level

1 parent a7b7252 commit a1adc19Copy full SHA for a1adc19

File tree

3 files changed

+28

-1

lines changed

src
- __tests__
  - fake-timers.js
- wait-for.js
types
- config.d.ts

3 files changed

+28

-1

lines changed

`‎src/tests/fake-timers.js‎`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {waitFor, waitForElementToBeRemoved} from '..'`
	`1`	`+import {configure,getConfig,waitFor, waitForElementToBeRemoved} from '..'`
`2`	`2`	`import {render} from './helpers/test-utils'`
`3`	`3`
`4`	`4`	`async function runWaitFor({time = 300} = {}, options) {`
`@@ -11,8 +11,14 @@ async function runWaitFor({time = 300} = {}, options) {`
`11`	`11`	`await waitFor(() => expect(result).toBe(response), options)`
`12`	`12`	`}`
`13`	`13`
	`14`	`+let originalConfig`
	`15`	`+beforeAll(() => {`
	`16`	`+ originalConfig = getConfig()`
	`17`	`+})`
	`18`	`+`
`14`	`19`	`afterEach(() => {`
`15`	`20`	`jest.useRealTimers()`
	`21`	`+ configure(originalConfig)`
`16`	`22`	`})`
`17`	`23`
`18`	`24`	`test('real timers', async () => {`
`@@ -43,6 +49,23 @@ test('fake timer timeout', async () => {`
`43`	`49`	).rejects.toMatchInlineSnapshot(`[Error: always throws]`)
`44`	`50`	`})`
`45`	`51`
	`52`	`+test('fake timer timeout uses default ontimeout', async () => {`
	`53`	`+ configure({`
	`54`	`+ defaultOnTimeout: _ => {`
	`55`	`+ return Error('Test Error')`
	`56`	`+ },`
	`57`	`+ })`
	`58`	`+ jest.useFakeTimers()`
	`59`	`+ await expect(`
	`60`	`+ waitFor(`
	`61`	`+ () => {`
	`62`	`+ throw new Error('always throws')`
	`63`	`+ },`
	`64`	`+ {timeout: 10},`
	`65`	`+ ),`
	`66`	+ ).rejects.toMatchInlineSnapshot(`[Error: Test Error]`)
	`67`	`+})`
	`68`	`+`
`46`	`69`	`test('times out after 1000ms by default', async () => {`
`47`	`70`	`const startReal = performance.now()`
`48`	`71`	`jest.useFakeTimers()`

`‎src/wait-for.js‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ function waitFor(`
`24`	`24`	`stackTraceError,`
`25`	`25`	`interval = 50,`
`26`	`26`	`onTimeout = error => {`
	`27`	`+ if (getConfig().defaultOnTimeout) {`
	`28`	`+ return getConfig().defaultOnTimeout(error)`
	`29`	`+ }`
`27`	`30`	`Object.defineProperty(error, 'message', {`
`28`	`31`	`value: getConfig().getElementError(error.message, container).message,`
`29`	`32`	`})`

`‎types/config.d.ts‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export interface Config {`
`14`	`14`	`defaultHidden: boolean`
`15`	`15`	/** default value for the `ignore` option in `ByText` queries */
`16`	`16`	`defaultIgnore: string`
	`17`	`+ defaultOnTimeout?: (error: Error) => Error`
`17`	`18`	`showOriginalStackTrace: boolean`
`18`	`19`	`throwSuggestions: boolean`
`19`	`20`	`getElementError: (message: string \| null, container: Element) => Error`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a1adc19

File tree

3 files changed

3 files changed

`‎src/tests/fake-timers.js‎`

`‎src/wait-for.js‎`

`‎types/config.d.ts‎`

0 commit comments

File tree

3 files changed

3 files changed

‎src/__tests__/fake-timers.js‎

‎src/wait-for.js‎

‎types/config.d.ts‎

0 commit comments

`‎src/tests/fake-timers.js‎`

`‎src/wait-for.js‎`

`‎types/config.d.ts‎`