Skip to content

Commit f51ab8e

Browse files
committed
Rollback env variable
1 parent ece1dc4 commit f51ab8e

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

rb/spec/integration/selenium/webdriver/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ def example_finished(notification)
7272
guards.add_condition(:headless, !ENV['HEADLESS'].nil?)
7373
guards.add_condition(:bidi, !ENV['WEBDRIVER_BIDI'].nil?)
7474
guards.add_condition(:rbe, GlobalTestEnv.rbe?)
75-
guards.add_condition(:version, GlobalTestEnv.version)
7675

7776
results = guards.disposition
7877
send(*results) if results

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@ def rbe?
119119
Dir.pwd.start_with?('/mnt/engflow')
120120
end
121121

122-
def version
123-
return 'stable' if WebDriver::Platform.windows?
124-
125-
ENV['WD_BROWSER_VERSION'] || 'stable'
126-
end
127-
128122
def reset_remote_server
129123
@remote_server&.stop
130124
@remote_server = nil
@@ -272,7 +266,7 @@ def safari_preview_driver(**opts)
272266
end
273267

274268
def chrome_options(args: [], **opts)
275-
opts[:browser_version] = version
269+
opts[:browser_version] = 'stable' if WebDriver::Platform.windows?
276270
opts[:web_socket_url] = true if ENV['WEBDRIVER_BIDI'] && !opts.key?(:web_socket_url)
277271
opts[:binary] ||= ENV['CHROME_BINARY'] if ENV.key?('CHROME_BINARY')
278272
args << '--headless=chrome' if ENV['HEADLESS']
@@ -282,7 +276,7 @@ def chrome_options(args: [], **opts)
282276
end
283277

284278
def edge_options(args: [], **opts)
285-
opts[:browser_version] = version
279+
opts[:browser_version] = 'stable' if WebDriver::Platform.windows?
286280
opts[:web_socket_url] = true if ENV['WEBDRIVER_BIDI'] && !opts.key?(:web_socket_url)
287281
opts[:binary] ||= ENV['EDGE_BINARY'] if ENV.key?('EDGE_BINARY')
288282
args << '--headless=chrome' if ENV['HEADLESS']
@@ -292,7 +286,7 @@ def edge_options(args: [], **opts)
292286
end
293287

294288
def firefox_options(args: [], **opts)
295-
opts[:browser_version] = version
289+
opts[:browser_version] = 'stable' if WebDriver::Platform.windows?
296290
opts[:web_socket_url] = true if ENV['WEBDRIVER_BIDI'] && !opts.key?(:web_socket_url)
297291
opts[:binary] ||= ENV['FIREFOX_BINARY'] if ENV.key?('FIREFOX_BINARY')
298292
args << '--headless' if ENV['HEADLESS']

scripts/pinned_browsers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ def firefox_version_data():
416416

417417

418418
def firefox_linux(version):
419+
return "https://ftp.mozilla.org/pub/firefox/releases/%s/linux-x86_64/en-US/firefox-%s.tar.bz2" % (version, version)
419420
if int(version.split(".")[0]) < 135:
420421
return "https://ftp.mozilla.org/pub/firefox/releases/%s/linux-x86_64/en-US/firefox-%s.tar.bz2" % (
421422
version, version)
@@ -517,3 +518,4 @@ def _pin_browsers_extension_impl(_ctx):
517518

518519
with open(target_file_path, "w") as file:
519520
file.write(content)
521+

0 commit comments

Comments
 (0)