Skip to content

Commit dff0517

Browse files
authored
Revert "feat: add AbortSignal support to client-side Waiter methods" (#41197)
1 parent 838aae3 commit dff0517

19 files changed

Lines changed: 109 additions & 320 deletions

File tree

docs/src/api/class-browsercontext.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,6 @@ Receives the [ConsoleMessage] object and resolves to truthy value when the waiti
17131713

17141714
### option: BrowserContext.waitForConsoleMessage.timeout = %%-wait-for-event-timeout-%%
17151715
* since: v1.34
1716-
### option: BrowserContext.waitForConsoleMessage.signal = %%-wait-for-event-signal-%%
17171716

17181717
### param: BrowserContext.waitForConsoleMessage.callback = %%-java-wait-for-event-callback-%%
17191718
* since: v1.34
@@ -1783,7 +1782,6 @@ Either a predicate that receives an event or an options object. Optional.
17831782

17841783
### option: BrowserContext.waitForEvent.timeout = %%-wait-for-event-timeout-%%
17851784
* since: v1.8
1786-
### option: BrowserContext.waitForEvent.signal = %%-wait-for-event-signal-%%
17871785

17881786
## async method: BrowserContext.waitForPage
17891787
* since: v1.9
@@ -1813,7 +1811,6 @@ Receives the [Page] object and resolves to truthy value when the waiting should
18131811

18141812
### option: BrowserContext.waitForPage.timeout = %%-wait-for-event-timeout-%%
18151813
* since: v1.9
1816-
### option: BrowserContext.waitForPage.signal = %%-wait-for-event-signal-%%
18171814

18181815
### param: BrowserContext.waitForPage.callback = %%-java-wait-for-event-callback-%%
18191816
* since: v1.9
@@ -1840,4 +1837,3 @@ Will throw an error if the browser context is closed before the `event` is fired
18401837

18411838
### option: BrowserContext.waitForEvent2.timeout = %%-wait-for-event-timeout-%%
18421839
* since: v1.8
1843-
### option: BrowserContext.waitForEvent2.signal = %%-wait-for-event-signal-%%

docs/src/api/class-frame.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,7 +2010,6 @@ await frame.WaitForLoadStateAsync(); // Defaults to LoadState.Load
20102010

20112011
### option: Frame.waitForLoadState.timeout = %%-navigation-timeout-js-%%
20122012
* since: v1.8
2013-
### option: Frame.waitForLoadState.signal = %%-wait-for-event-signal-%%
20142013

20152014
## async method: Frame.waitForNavigation
20162015
* since: v1.8
@@ -2094,7 +2093,6 @@ a navigation.
20942093

20952094
### option: Frame.waitForNavigation.timeout = %%-navigation-timeout-js-%%
20962095
* since: v1.8
2097-
### option: Frame.waitForNavigation.signal = %%-wait-for-event-signal-%%
20982096

20992097
### param: Frame.waitForNavigation.callback = %%-java-wait-for-event-callback-%%
21002098
* since: v1.9
@@ -2291,7 +2289,6 @@ await frame.WaitForURLAsync("**/target.html");
22912289

22922290
### option: Frame.waitForURL.timeout = %%-navigation-timeout-js-%%
22932291
* since: v1.11
2294-
### option: Frame.waitForURL.signal = %%-wait-for-event-signal-%%
22952292

22962293
### option: Frame.waitForURL.waitUntil = %%-navigation-wait-until-%%
22972294
* since: v1.11

docs/src/api/class-page.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4507,7 +4507,6 @@ Performs action and waits for the Page to close.
45074507

45084508
### option: Page.waitForClose.timeout = %%-wait-for-event-timeout-%%
45094509
* since: v1.9
4510-
### option: Page.waitForClose.signal = %%-wait-for-event-signal-%%
45114510

45124511
### param: Page.waitForClose.callback = %%-java-wait-for-event-callback-%%
45134512
* since: v1.9
@@ -4539,7 +4538,6 @@ Receives the [ConsoleMessage] object and resolves to truthy value when the waiti
45394538

45404539
### option: Page.waitForConsoleMessage.timeout = %%-wait-for-event-timeout-%%
45414540
* since: v1.9
4542-
### option: Page.waitForConsoleMessage.signal = %%-wait-for-event-signal-%%
45434541

45444542
### param: Page.waitForConsoleMessage.callback = %%-java-wait-for-event-callback-%%
45454543
* since: v1.9
@@ -4571,7 +4569,6 @@ Receives the [Download] object and resolves to truthy value when the waiting sho
45714569

45724570
### option: Page.waitForDownload.timeout = %%-wait-for-event-timeout-%%
45734571
* since: v1.9
4574-
### option: Page.waitForDownload.signal = %%-wait-for-event-signal-%%
45754572

45764573
### param: Page.waitForDownload.callback = %%-java-wait-for-event-callback-%%
45774574
* since: v1.9
@@ -4628,7 +4625,6 @@ Either a predicate that receives an event or an options object. Optional.
46284625

46294626
### option: Page.waitForEvent.timeout = %%-wait-for-event-timeout-%%
46304627
* since: v1.8
4631-
### option: Page.waitForEvent.signal = %%-wait-for-event-signal-%%
46324628

46334629
## async method: Page.waitForFileChooser
46344630
* since: v1.9
@@ -4657,7 +4653,6 @@ Receives the [FileChooser] object and resolves to truthy value when the waiting
46574653

46584654
### option: Page.waitForFileChooser.timeout = %%-wait-for-event-timeout-%%
46594655
* since: v1.9
4660-
### option: Page.waitForFileChooser.signal = %%-wait-for-event-signal-%%
46614656

46624657
### param: Page.waitForFileChooser.callback = %%-java-wait-for-event-callback-%%
46634658
* since: v1.9
@@ -4895,7 +4890,6 @@ Console.WriteLine(await popup.TitleAsync()); // popup is ready to use.
48954890

48964891
### option: Page.waitForLoadState.timeout = %%-navigation-timeout-js-%%
48974892
* since: v1.8
4898-
### option: Page.waitForLoadState.signal = %%-wait-for-event-signal-%%
48994893

49004894
## async method: Page.waitForNavigation
49014895
* since: v1.8
@@ -4982,7 +4976,6 @@ a navigation.
49824976

49834977
### option: Page.waitForNavigation.timeout = %%-navigation-timeout-js-%%
49844978
* since: v1.8
4985-
### option: Page.waitForNavigation.signal = %%-wait-for-event-signal-%%
49864979

49874980
### param: Page.waitForNavigation.callback = %%-java-wait-for-event-callback-%%
49884981
* since: v1.9
@@ -5014,7 +5007,6 @@ Receives the [Page] object and resolves to truthy value when the waiting should
50145007

50155008
### option: Page.waitForPopup.timeout = %%-wait-for-event-timeout-%%
50165009
* since: v1.9
5017-
### option: Page.waitForPopup.signal = %%-wait-for-event-signal-%%
50185010

50195011
### param: Page.waitForPopup.callback = %%-java-wait-for-event-callback-%%
50205012
* since: v1.9
@@ -5124,8 +5116,6 @@ Request URL string, regex or predicate receiving [Request] object.
51245116
Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can be
51255117
changed by using the [`method: Page.setDefaultTimeout`] method.
51265118

5127-
### option: Page.waitForRequest.signal = %%-wait-for-event-signal-%%
5128-
51295119
### param: Page.waitForRequest.callback = %%-java-wait-for-event-callback-%%
51305120
* since: v1.9
51315121

@@ -5156,7 +5146,6 @@ Receives the [Request] object and resolves to truthy value when the waiting shou
51565146

51575147
### option: Page.waitForRequestFinished.timeout = %%-wait-for-event-timeout-%%
51585148
* since: v1.12
5159-
### option: Page.waitForRequestFinished.signal = %%-wait-for-event-signal-%%
51605149

51615150
### param: Page.waitForRequestFinished.callback = %%-java-wait-for-event-callback-%%
51625151
* since: v1.12
@@ -5273,8 +5262,6 @@ it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/We
52735262
Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can be
52745263
changed by using the [`method: BrowserContext.setDefaultTimeout`] or [`method: Page.setDefaultTimeout`] methods.
52755264

5276-
### option: Page.waitForResponse.signal = %%-wait-for-event-signal-%%
5277-
52785265
### param: Page.waitForResponse.callback = %%-java-wait-for-event-callback-%%
52795266
* since: v1.9
52805267

@@ -5526,7 +5513,6 @@ await page.WaitForURLAsync("**/target.html");
55265513

55275514
### option: Page.waitForURL.timeout = %%-navigation-timeout-js-%%
55285515
* since: v1.11
5529-
### option: Page.waitForURL.signal = %%-wait-for-event-signal-%%
55305516

55315517
### option: Page.waitForURL.waitUntil = %%-navigation-wait-until-%%
55325518
* since: v1.11
@@ -5558,7 +5544,6 @@ Receives the [WebSocket] object and resolves to truthy value when the waiting sh
55585544

55595545
### option: Page.waitForWebSocket.timeout = %%-wait-for-event-timeout-%%
55605546
* since: v1.9
5561-
### option: Page.waitForWebSocket.signal = %%-wait-for-event-signal-%%
55625547

55635548
### param: Page.waitForWebSocket.callback = %%-java-wait-for-event-callback-%%
55645549
* since: v1.9
@@ -5590,7 +5575,6 @@ Receives the [Worker] object and resolves to truthy value when the waiting shoul
55905575

55915576
### option: Page.waitForWorker.timeout = %%-wait-for-event-timeout-%%
55925577
* since: v1.9
5593-
### option: Page.waitForWorker.signal = %%-wait-for-event-signal-%%
55945578

55955579
### param: Page.waitForWorker.callback = %%-java-wait-for-event-callback-%%
55965580
* since: v1.9
@@ -5628,4 +5612,3 @@ Will throw an error if the page is closed before the `event` is fired.
56285612

56295613
### option: Page.waitForEvent2.timeout = %%-wait-for-event-timeout-%%
56305614
* since: v1.8
5631-
### option: Page.waitForEvent2.signal = %%-wait-for-event-signal-%%

docs/src/api/class-websocket.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ Either a predicate that receives an event or an options object. Optional.
9797

9898
### option: WebSocket.waitForEvent.timeout = %%-wait-for-event-timeout-%%
9999
* since: v1.8
100-
### option: WebSocket.waitForEvent.signal = %%-wait-for-event-signal-%%
101100

102101
## async method: WebSocket.waitForFrameReceived
103102
* since: v1.10
@@ -116,7 +115,6 @@ Receives the [WebSocketFrame] object and resolves to truthy value when the waiti
116115

117116
### option: WebSocket.waitForFrameReceived.timeout = %%-wait-for-event-timeout-%%
118117
* since: v1.9
119-
### option: WebSocket.waitForFrameReceived.signal = %%-wait-for-event-signal-%%
120118

121119
### param: WebSocket.waitForFrameReceived.callback = %%-java-wait-for-event-callback-%%
122120
* since: v1.9
@@ -138,7 +136,6 @@ Receives the [WebSocketFrame] object and resolves to truthy value when the waiti
138136

139137
### option: WebSocket.waitForFrameSent.timeout = %%-wait-for-event-timeout-%%
140138
* since: v1.9
141-
### option: WebSocket.waitForFrameSent.signal = %%-wait-for-event-signal-%%
142139

143140
### param: WebSocket.waitForFrameSent.callback = %%-java-wait-for-event-callback-%%
144141
* since: v1.9
@@ -165,4 +162,3 @@ Will throw an error if the socket is closed before the `event` is fired.
165162

166163
### option: WebSocket.waitForEvent2.timeout = %%-wait-for-event-timeout-%%
167164
* since: v1.8
168-
### option: WebSocket.waitForEvent2.signal = %%-wait-for-event-signal-%%

docs/src/api/class-worker.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ Performs action and waits for the Worker to close.
126126

127127
### option: Worker.waitForClose.timeout = %%-wait-for-event-timeout-%%
128128
* since: v1.9
129-
### option: Worker.waitForClose.signal = %%-wait-for-event-signal-%%
130129

131130
### param: Worker.waitForClose.callback = %%-java-wait-for-event-callback-%%
132131
* since: v1.9
@@ -146,7 +145,6 @@ Receives the [ConsoleMessage] object and resolves to true when the waiting shoul
146145

147146
### option: Worker.waitForConsoleMessage.timeout = %%-wait-for-event-timeout-%%
148147
* since: v1.57
149-
### option: Worker.waitForConsoleMessage.signal = %%-wait-for-event-signal-%%
150148

151149
### param: Worker.waitForConsoleMessage.callback = %%-java-wait-for-event-callback-%%
152150
* since: v1.57
@@ -205,4 +203,3 @@ Either a predicate that receives an event or an options object. Optional.
205203

206204
### option: Worker.waitForEvent.timeout = %%-wait-for-event-timeout-%%
207205
* since: v1.57
208-
### option: Worker.waitForEvent.signal = %%-wait-for-event-signal-%%

docs/src/api/params.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -991,14 +991,6 @@ Receives the event data and resolves to truthy value when the waiting should res
991991
Maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
992992
The default value can be changed by using the [`method: BrowserContext.setDefaultTimeout`].
993993

994-
## wait-for-event-signal
995-
* langs: js
996-
* since: v1.61
997-
- `signal` <[AbortSignal]>
998-
999-
Allows to cancel the waiting using an [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal). If the signal is aborted, the waiting will be aborted and the operation will throw an error.
1000-
Note that providing a signal does not disable the default timeout; pass `timeout: 0` to disable the timeout entirely.
1001-
1002994
## android-timeout
1003995
* langs: js
1004996
- `timeout` <[float]>

0 commit comments

Comments
 (0)