Skip to content

Commit 1907162

Browse files
authored
Merge branch 'trunk' into rb_add_support_for_chrome_beta
2 parents 4b3ce4c + a39a168 commit 1907162

File tree

19 files changed

+781
-50
lines changed

19 files changed

+781
-50
lines changed

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
6262
[JsonSerializable(typeof(Modules.Script.AudioWorkletRealmInfo))]
6363
[JsonSerializable(typeof(Modules.Script.WorkletRealmInfo))]
6464

65+
[JsonSerializable(typeof(Modules.Log.GenericLogEntry))]
6566
[JsonSerializable(typeof(Modules.Log.ConsoleLogEntry))]
6667
[JsonSerializable(typeof(Modules.Log.JavascriptLogEntry))]
6768
#endregion

py/conftest.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,24 @@ def fin():
154154
if driver_instance is None:
155155
if driver_class == "Firefox":
156156
options = get_options(driver_class, request.config)
157+
# There are issues with window size/position when running Firefox
158+
# under Wayland, so we use XWayland instead.
159+
os.environ["MOZ_ENABLE_WAYLAND"] = "0"
157160
if driver_class == "Chrome":
158161
options = get_options(driver_class, request.config)
159162
if driver_class == "Edge":
160163
options = get_options(driver_class, request.config)
161164
if driver_class == "WebKitGTK":
162165
options = get_options(driver_class, request.config)
163-
if driver_class.lower() == "WPEWebKit":
166+
if driver_class == "WPEWebKit":
164167
options = get_options(driver_class, request.config)
165168
if driver_class == "Remote":
166169
options = get_options("Firefox", request.config) or webdriver.FirefoxOptions()
167170
options.set_capability("moz:firefoxOptions", {})
168171
options.enable_downloads = True
172+
# There are issues with window size/position when running Firefox
173+
# under Wayland, so we use XWayland instead.
174+
os.environ["MOZ_ENABLE_WAYLAND"] = "0"
169175
if driver_path is not None:
170176
kwargs["service"] = get_service(driver_class, driver_path)
171177
if options is not None:

py/docs/selenium_logo_small.png

-647 Bytes
Binary file not shown.

py/docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
# The name of an image file (relative to this directory) to place at the top
119119
# of the sidebar.
120-
html_logo = '../selenium_logo_small.png'
120+
#html_logo = ''
121121

122122
# The name of an image file (within the static path) to use as favicon of the
123123
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32

0 commit comments

Comments
 (0)