Skip to content

Commit fb4a2de

Browse files
authored
Merge branch 'SeleniumHQ:trunk' into py-fix-test-args
2 parents 8cef078 + 93b78e6 commit fb4a2de

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

.bazelrc.remote

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ build:rbe --disk_cache=
3131
build:rbe --incompatible_enable_cc_toolchain_resolution
3232
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
3333
test:rbe --test_env=DISPLAY=:99.0
34-
test:rbe --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
34+
test:rbe --test_tag_filters=-skip-rbe,-remote
3535

3636
# Env vars we can hard code
3737
build:rbe --action_env=HOME=/home/dev

.github/workflows/pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
- name: Commit version updates
104104
run: git commit -m "bump versions in preparation for release"
105105
- name: Update changelog
106-
run: ./go all:changelog
106+
run: ./go all:changelogs
107107
- name: Commit changelog updates
108108
run: git commit -m "WIP - rough auto-update of changelog, please edit"
109109
- name: List untracked files

Rakefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ end
166166
desc 'Update Selenium Manager to latest release'
167167
task :update_manager do |_task, _arguments|
168168
puts 'Updating Selenium Manager references'
169-
Bazel.execute('run', args, '//scripts:selenium_manager')
169+
Bazel.execute('run', [], '//scripts:selenium_manager')
170170

171171
@git.add('common/selenium_manager.bzl')
172172
end
@@ -1181,6 +1181,7 @@ namespace :all do
11811181
Rake::Task['py:lint'].invoke
11821182
end
11831183

1184+
# Example: `./go all:prepare 4.31.0 early-stable`
11841185
desc 'Update everything in preparation for a release'
11851186
task :prepare, [:version, :channel] do |_task, arguments|
11861187
version = arguments[:version]
@@ -1206,7 +1207,7 @@ namespace :all do
12061207
Rake::Task['rust:version'].invoke(version)
12071208

12081209
unless version == 'nightly'
1209-
Rake::Task['all:changelogs']
1210+
Rake::Task['all:changelogs'].invoke
12101211

12111212
major_minor = arguments[:version][/^\d+\.\d+/]
12121213
file = '.github/ISSUE_TEMPLATE/bug-report.yml'

rb/spec/integration/selenium/webdriver/bidi/browsing_context_spec.rb

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,31 @@ class BiDi
7474
expect(handles).not_to include(window2)
7575
end
7676

77-
it 'sets the viewport' do
77+
it 'sets the viewport', except: {rbe: true, reason: 'unknown, returns value of 1 instead of 2.0'} do
7878
browsing_context = described_class.new(bridge)
7979
browsing_context.set_viewport(width: 800, height: 600, device_pixel_ratio: 2.0)
8080
expect(driver.execute_script('return [window.innerWidth, window.innerHeight]')).to eq([800, 600])
8181
expect(driver.execute_script('return window.devicePixelRatio')).to eq(2.0)
8282
end
8383

84-
it 'accepts users prompts without text' do
84+
it 'accepts users prompts without text',
85+
except: {browser: %i[edge chrome],
86+
reason: 'https://github.com/GoogleChromeLabs/chromium-bidi/issues/3281'} do
8587
browsing_context = described_class.new(bridge)
8688

8789
driver.navigate.to url_for('alerts.html')
8890
driver.find_element(id: 'alert').click
89-
wait.until { driver.switch_to.alert }
91+
wait_for_alert
9092
window = driver.window_handles.first
9193
browsing_context.handle_user_prompt(window, accept: true)
9294
wait_for_no_alert
9395

9496
expect(driver.title).to eq('Testing Alerts')
9597
end
9698

97-
it 'accepts users prompts with text' do
99+
it 'accepts users prompts with text',
100+
except: {browser: %i[edge chrome],
101+
reason: 'https://github.com/GoogleChromeLabs/chromium-bidi/issues/3281'} do
98102
browsing_context = described_class.new(bridge)
99103
driver.navigate.to url_for('alerts.html')
100104
driver.find_element(id: 'prompt').click
@@ -106,7 +110,8 @@ class BiDi
106110
expect(driver.title).to eq('Testing Alerts')
107111
end
108112

109-
it 'rejects users prompts' do
113+
it 'rejects users prompts', except: {browser: %i[edge chrome],
114+
reason: 'https://github.com/GoogleChromeLabs/chromium-bidi/issues/3281'} do
110115
browsing_context = described_class.new(bridge)
111116
driver.navigate.to url_for('alerts.html')
112117
driver.find_element(id: 'alert').click

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
module Selenium
2323
module WebDriver
2424
module FedCM
25-
describe FedCM, exclusive: [{ bidi: false, reason: 'Not yet implemented with BiDi' }, { browser: %i[chrome edge] }] do
25+
describe FedCM,
26+
exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: %i[chrome edge]}] do
2627
let(:dialog) { driver.fedcm_dialog }
2728

2829
before { driver.get url_for('fedcm/fedcm.html') }
@@ -66,8 +67,8 @@ module FedCM
6667
expect(dialog.select_account(1)).to be_nil
6768
end
6869

69-
it 'clicks the dialog', except: { browser: %i[chrome edge],
70-
reason: "error: 'Use another account' not supported for this IDP" } do
70+
it 'clicks the dialog', except: {browser: %i[chrome edge],
71+
reason: "error: 'Use another account' not supported for this IDP"} do
7172
expect(dialog.click).to be_nil
7273
end
7374

0 commit comments

Comments
 (0)