Merge branch 'trunk' into pinned-browser-updates

diemol · web-flow · commit e4f21883e2e7 · 2025-05-07T19:49:17.000+02:00
diff --git a/java/src/org/openqa/selenium/remote/RemoteStatus.java b/java/src/org/openqa/selenium/remote/RemoteStatus.java
diff --git a/java/src/org/openqa/selenium/remote/ScreenshotException.java b/java/src/org/openqa/selenium/remote/ScreenshotException.java
@@ -32,9 +32,4 @@ public ScreenshotException(Throwable cause) {
   public ScreenshotException(String message, Throwable cause) {
     super(message, cause);
   }
-
-  @Deprecated(forRemoval = true)
-  public String getBase64EncodedScreenshot() {
-    return null;
-  }
 }
diff --git a/py/test/selenium/webdriver/marionette/conftest.py b/py/test/selenium/webdriver/marionette/conftest.py
@@ -24,6 +24,7 @@
 @pytest.fixture
 def options():
     options = FirefoxOptions()
+    options.add_argument("-remote-allow-system-access")
     return options
 
 

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,4 @@ public ScreenshotException(Throwable cause) {`
`32`	`32`	`public ScreenshotException(String message, Throwable cause) {`
`33`	`33`	`super(message, cause);`
`34`	`34`	`}`
`35`		`-`
`36`		`- @Deprecated(forRemoval = true)`
`37`		`- public String getBase64EncodedScreenshot() {`
`38`		`- return null;`
`39`		`- }`
`40`	`35`	`}`