Skip to content

Commit 1cfa0a0

Browse files
committed
[rb] restart sessions between target locator tests on RBE to minimize spurious failures
also see 04a8796
1 parent 8313156 commit 1cfa0a0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ module WebDriver
2525
before { @original_window = driver.window_handle }
2626

2727
after do
28-
handles = driver.window_handles
29-
driver.switch_to.window(@original_window) if handles.include?(@original_window)
30-
31-
(handles - [driver.window_handle]).each do |handle|
32-
driver.switch_to.window(handle) { driver.close }
28+
if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome
29+
reset_driver!
30+
else
31+
handles = driver.window_handles
32+
driver.switch_to.window(@original_window) if handles.include?(@original_window)
33+
34+
(handles - [driver.window_handle]).each do |handle|
35+
driver.switch_to.window(handle) { driver.close }
36+
end
3337
end
34-
rescue Selenium::WebDriver::Error::WebDriverError
35-
reset_driver!
3638
end
3739

3840
let(:new_window) { driver.window_handles.find { |handle| handle != driver.window_handle } }
@@ -327,8 +329,6 @@ module WebDriver
327329
end
328330

329331
describe 'unhandled alert error' do
330-
after { |example| reset_driver!(example: example) }
331-
332332
it 'raises an UnexpectedAlertOpenError if an alert has not been dealt with' do
333333
driver.navigate.to url_for('alerts.html')
334334
driver.find_element(id: 'alert').click

0 commit comments

Comments
 (0)