Skip to content

Commit 7256c5a

Browse files
authored
Merge branch 'trunk' into pinned-browser-updates
2 parents 226730b + 71ad272 commit 7256c5a

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

rb/spec/integration/selenium/webdriver/fedcm_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module Selenium
2323
module WebDriver
2424
module FedCM
2525
describe FedCM,
26+
exclude: {version: GlobalTestEnv.beta_chrome_version, reason: 'https://issues.chromium.org/u/0/issues/425801332'},
2627
exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: %i[chrome edge]}] do
2728
let(:dialog) { driver.fedcm_dialog }
2829

rb/spec/integration/selenium/webdriver/network_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
module Selenium
2323
module WebDriver
24-
describe Network, exclusive: {bidi: true, reason: 'only executed when bidi is enabled'},
24+
describe Network, exclude: {version: GlobalTestEnv.beta_chrome_version},
25+
exclusive: {bidi: true, reason: 'only executed when bidi is enabled'},
2526
only: {browser: %i[chrome edge firefox]} do
2627
let(:username) { SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.first }
2728
let(:password) { SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.last }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ 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.browser_version)
7576

7677
results = guards.disposition
7778
send(*results) if results

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ def browser
5757
end
5858
end
5959

60+
def browser_version
61+
driver_instance.capabilities.browser_version
62+
end
63+
6064
def driver_instance(...)
6165
@driver_instance || create_driver!(...)
6266
end
@@ -189,6 +193,18 @@ def create_driver!(listener: nil, **, &block)
189193
raise e
190194
end
191195

196+
def beta_chrome_version
197+
chrome_beta_url = 'https://chromereleases.googleblog.com/search/label/Beta%20updates'
198+
199+
uri = URI.parse(chrome_beta_url)
200+
201+
response = Net::HTTP.get_response(uri)
202+
203+
return "Failed to fetch Chrome Beta page: #{response&.code}" unless response.is_a?(Net::HTTPSuccess)
204+
205+
response.body.match(/\d+\.\d+\.\d+\.\d+/).to_s
206+
end
207+
192208
private
193209

194210
def build_options(**)
@@ -204,7 +220,7 @@ def current_env
204220
{
205221
browser: browser,
206222
driver: driver,
207-
version: driver_instance.capabilities.browser_version,
223+
version: browser_version,
208224
platform: Platform.os,
209225
ci: Platform.ci,
210226
rbe: rbe?

0 commit comments

Comments
 (0)