Skip to content

Commit 6fe1746

Browse files
Skn0ttSkn0tt
committed
more
1 parent e82ab1c commit 6fe1746

File tree

5 files changed

+30
-5
lines changed

5 files changed

+30
-5
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom
1010

1111
| | Linux | macOS | Windows |
1212
| :--- | :---: | :---: | :---: |
13-
| Chromium <!-- GEN:chromium-version -->136.0.7103.25<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
13+
| Chromium <!-- GEN:chromium-version -->137.0.7151.27<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
1414
| WebKit <!-- GEN:webkit-version -->18.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
1515
| Firefox <!-- GEN:firefox-version -->137.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
1616

‎examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<name>Playwright Client Examples</name>
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13-
<playwright.version>1.51.0</playwright.version>
13+
<playwright.version>1.53.0</playwright.version>
1414
</properties>
1515
<dependencies>
1616
<dependency>

‎playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ void dblclickImpl(String selector, DblclickOptions options) {
271271
if (options == null) {
272272
options = new DblclickOptions();
273273
}
274+
options.timeout = timeout(options.timeout);
274275
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
275276
params.addProperty("selector", selector);
276277
sendMessage("dblclick", params);
@@ -285,6 +286,7 @@ void dispatchEventImpl(String selector, String type, Object eventInit, DispatchE
285286
if (options == null) {
286287
options = new DispatchEventOptions();
287288
}
289+
options.timeout = timeout(options.timeout);
288290
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
289291
params.addProperty("selector", selector);
290292
params.addProperty("type", type);
@@ -330,6 +332,7 @@ void fillImpl(String selector, String value, FillOptions options) {
330332
if (options == null) {
331333
options = new FillOptions();
332334
}
335+
options.timeout = timeout(options.timeout);
333336
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
334337
params.addProperty("selector", selector);
335338
params.addProperty("value", value);
@@ -441,6 +444,7 @@ String getAttributeImpl(String selector, String name, GetAttributeOptions option
441444
if (options == null) {
442445
options = new GetAttributeOptions();
443446
}
447+
options.timeout = timeout(options.timeout);
444448
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
445449
params.addProperty("selector", selector);
446450
params.addProperty("name", name);
@@ -460,6 +464,7 @@ ResponseImpl navigateImpl(String url, NavigateOptions options) {
460464
if (options == null) {
461465
options = new NavigateOptions();
462466
}
467+
options.timeout = timeout(options.timeout);
463468
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
464469
params.addProperty("url", url);
465470
JsonElement result = sendMessage("goto", params);
@@ -479,6 +484,7 @@ void hoverImpl(String selector, HoverOptions options) {
479484
if (options == null) {
480485
options = new HoverOptions();
481486
}
487+
options.timeout = timeout(options.timeout);
482488
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
483489
params.addProperty("selector", selector);
484490
sendMessage("hover", params);
@@ -493,6 +499,7 @@ void dragAndDropImpl(String source, String target, DragAndDropOptions options) {
493499
if (options == null) {
494500
options = new DragAndDropOptions();
495501
}
502+
options.timeout = timeout(options.timeout);
496503
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
497504
params.addProperty("source", source);
498505
params.addProperty("target", target);
@@ -540,6 +547,7 @@ String inputValueImpl(String selector, InputValueOptions options) {
540547
if (options == null) {
541548
options = new InputValueOptions();
542549
}
550+
options.timeout = timeout(options.timeout);
543551
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
544552
params.addProperty("selector", selector);
545553
JsonObject json = sendMessage("inputValue", params).getAsJsonObject();
@@ -555,6 +563,7 @@ boolean isCheckedImpl(String selector, IsCheckedOptions options) {
555563
if (options == null) {
556564
options = new IsCheckedOptions();
557565
}
566+
options.timeout = timeout(options.timeout);
558567
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
559568
params.addProperty("selector", selector);
560569
JsonObject json = sendMessage("isChecked", params).getAsJsonObject();
@@ -575,6 +584,7 @@ boolean isDisabledImpl(String selector, IsDisabledOptions options) {
575584
if (options == null) {
576585
options = new IsDisabledOptions();
577586
}
587+
options.timeout = timeout(options.timeout);
578588
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
579589
params.addProperty("selector", selector);
580590
JsonObject json = sendMessage("isDisabled", params).getAsJsonObject();
@@ -590,6 +600,7 @@ boolean isEditableImpl(String selector, IsEditableOptions options) {
590600
if (options == null) {
591601
options = new IsEditableOptions();
592602
}
603+
options.timeout = timeout(options.timeout);
593604
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
594605
params.addProperty("selector", selector);
595606
JsonObject json = sendMessage("isEditable", params).getAsJsonObject();
@@ -605,6 +616,7 @@ boolean isEnabledImpl(String selector, IsEnabledOptions options) {
605616
if (options == null) {
606617
options = new IsEnabledOptions();
607618
}
619+
options.timeout = timeout(options.timeout);
608620
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
609621
params.addProperty("selector", selector);
610622
JsonObject json = sendMessage("isEnabled", params).getAsJsonObject();
@@ -620,6 +632,7 @@ boolean isHiddenImpl(String selector, IsHiddenOptions options) {
620632
if (options == null) {
621633
options = new IsHiddenOptions();
622634
}
635+
options.timeout = timeout(options.timeout);
623636
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
624637
params.addProperty("selector", selector);
625638
JsonObject json = sendMessage("isHidden", params).getAsJsonObject();
@@ -670,6 +683,7 @@ void pressImpl(String selector, String key, PressOptions options) {
670683
if (options == null) {
671684
options = new PressOptions();
672685
}
686+
options.timeout = timeout(options.timeout);
673687
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
674688
params.addProperty("selector", selector);
675689
params.addProperty("key", key);
@@ -698,6 +712,7 @@ List<String> selectOptionImpl(String selector, String[] values, SelectOptionOpti
698712
if (options == null) {
699713
options = new SelectOptionOptions();
700714
}
715+
options.timeout = timeout(options.timeout);
701716
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
702717
params.addProperty("selector", selector);
703718
if (values != null) {
@@ -715,6 +730,7 @@ List<String> selectOptionImpl(String selector, ElementHandle[] values, SelectOpt
715730
if (options == null) {
716731
options = new SelectOptionOptions();
717732
}
733+
options.timeout = timeout(options.timeout);
718734
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
719735
params.addProperty("selector", selector);
720736
if (values != null) {
@@ -770,6 +786,7 @@ void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions optio
770786
if (options == null) {
771787
options = new SetInputFilesOptions();
772788
}
789+
options.timeout = timeout(options.timeout);
773790
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
774791
addFilePathUploadParams(files, params, page.context());
775792
params.addProperty("selector", selector);
@@ -791,6 +808,7 @@ void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOption
791808
if (options == null) {
792809
options = new SetInputFilesOptions();
793810
}
811+
options.timeout = timeout(options.timeout);
794812
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
795813
params.addProperty("selector", selector);
796814
params.add("payloads", toJsonArray(files));
@@ -820,6 +838,7 @@ String textContentImpl(String selector, TextContentOptions options) {
820838
if (options == null) {
821839
options = new TextContentOptions();
822840
}
841+
options.timeout = timeout(options.timeout);
823842
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
824843
params.addProperty("selector", selector);
825844
return sendMessage("textContent", params).getAsJsonObject().get("value").getAsString();
@@ -860,6 +879,7 @@ void uncheckImpl(String selector, UncheckOptions options) {
860879
if (options == null) {
861880
options = new UncheckOptions();
862881
}
882+
options.timeout = timeout(options.timeout);
863883
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
864884
params.addProperty("selector", selector);
865885
sendMessage("uncheck", params);
@@ -879,6 +899,7 @@ JSHandle waitForFunctionImpl(String pageFunction, Object arg, WaitForFunctionOpt
879899
if (options == null) {
880900
options = new WaitForFunctionOptions();
881901
}
902+
options.timeout = timeout(options.timeout);
882903
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
883904
params.addProperty("expression", pageFunction);
884905
params.add("arg", gson().toJsonTree(serializeArgument(arg)));
@@ -1062,6 +1083,7 @@ ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions option
10621083
if (options == null) {
10631084
options = new WaitForSelectorOptions();
10641085
}
1086+
options.timeout = timeout(options.timeout);
10651087
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
10661088
params.addProperty("selector", selector);
10671089
params.addProperty("omitReturnValue", omitReturnValue);

‎playwright/src/main/java/com/microsoft/playwright/impl/LocatorImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ private String ariaSnapshotImpl(AriaSnapshotOptions options) {
127127
if (options == null) {
128128
options = new AriaSnapshotOptions();
129129
}
130+
options.timeout = frame.timeout(options.timeout);
130131
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
131132
params.addProperty("selector", selector);
132133
JsonObject result = frame.sendMessage("ariaSnapshot", params).getAsJsonObject();
@@ -181,9 +182,7 @@ public int count() {
181182

182183
@Override
183184
public Locator describe(String description) {
184-
// TODO: fix this
185-
LocatorImpl locator = new LocatorImpl(frame, selector, null);
186-
return locator;
185+
throw new Error("not implemented yet");
187186
}
188187

189188
@Override

‎playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@ Response goBackImpl(GoBackOptions options) {
908908
if (options == null) {
909909
options = new GoBackOptions();
910910
}
911+
options.timeout = timeoutSettings.navigationTimeout(options.timeout);
911912
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
912913
JsonObject json = sendMessage("goBack", params).getAsJsonObject();
913914
if (json.has("response")) {
@@ -925,6 +926,7 @@ Response goForwardImpl(GoForwardOptions options) {
925926
if (options == null) {
926927
options = new GoForwardOptions();
927928
}
929+
options.timeout = timeoutSettings.navigationTimeout(options.timeout);
928930
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
929931
JsonObject json = sendMessage("goForward", params).getAsJsonObject();
930932
if (json.has("response")) {
@@ -1095,6 +1097,7 @@ private Response reloadImpl(ReloadOptions options) {
10951097
if (options == null) {
10961098
options = new ReloadOptions();
10971099
}
1100+
options.timeout = timeoutSettings.timeout(options.timeout);
10981101
JsonObject params = gson().toJsonTree(options).getAsJsonObject();
10991102
JsonObject json = sendMessage("reload", params).getAsJsonObject();
11001103
if (json.has("response")) {
@@ -1195,6 +1198,7 @@ private byte[] screenshotImpl(ScreenshotOptions options) {
11951198
if (options == null) {
11961199
options = new ScreenshotOptions();
11971200
}
1201+
options.timeout = timeoutSettings.timeout(options.timeout);
11981202
if (options.type == null) {
11991203
options.type = PNG;
12001204
if (options.path != null) {

0 commit comments

Comments
 (0)