Skip to content

Commit 22e458b

Browse files
committed
[rb] guard scroll tests from Firefox
1 parent 07dfc77 commit 22e458b

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

‎rb/spec/integration/selenium/webdriver/action_builder_spec.rb

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ module WebDriver
176176
driver.navigate.to url_for('javascriptPage.html')
177177
element = driver.find_element(id: 'doubleClickField')
178178

179+
sleep 0.5
179180
driver.action.double_click(element).perform
180181
expect(element.attribute(:value)).to eq('DoubleClicked')
181182
end
@@ -252,7 +253,7 @@ module WebDriver
252253
driver.navigate.to url_for('javascriptPage.html')
253254
element = driver.find_element(id: 'clickField')
254255
rect = element.rect
255-
driver.action.move_to_location(rect.x, rect.y).click.perform
256+
driver.action.move_to_location(rect.x.ceil, rect.y.ceil).click.perform
256257

257258
expect(element.attribute(:value)).to eq('Clicked')
258259
end
@@ -269,7 +270,7 @@ def in_viewport?(element)
269270
driver.execute_script(in_viewport, element)
270271
end
271272

272-
describe '#scroll_to' do
273+
describe '#scroll_to', only: {browser: %i[chrome edge]} do
273274
it 'scrolls to element' do
274275
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html')
275276
iframe = driver.find_element(tag_name: 'iframe')
@@ -281,7 +282,7 @@ def in_viewport?(element)
281282
end
282283
end
283284

284-
describe '#scroll_from' do
285+
describe '#scroll_from', only: {browser: %i[chrome edge]} do
285286
it 'scrolls from element by the provided amount' do
286287
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html')
287288

@@ -315,7 +316,7 @@ def in_viewport?(element)
315316
end
316317
end
317318

318-
describe '#scroll_by' do
319+
describe '#scroll_by', only: {browser: %i[chrome edge]} do
319320
it 'scrolls by amount provided' do
320321
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html')
321322

@@ -326,25 +327,25 @@ def in_viewport?(element)
326327

327328
expect(in_viewport?(footer)).to eq true
328329
end
329-
end
330330

331-
it 'scrolls by amount provided from provided origin' do
332-
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame.html')
331+
it 'scrolls by amount provided from provided origin' do
332+
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame.html')
333333

334-
iframe = driver.find_element(tag_name: 'iframe')
335-
driver.action.scroll_by(0, 200, origin_x: 10, origin_y: 10).perform
334+
iframe = driver.find_element(tag_name: 'iframe')
335+
driver.action.scroll_by(0, 200, origin_x: 10, origin_y: 10).perform
336336

337-
driver.switch_to.frame(iframe)
338-
checkbox = driver.find_element(name: 'scroll_checkbox')
339-
expect(in_viewport?(checkbox)).to eq true
340-
end
337+
driver.switch_to.frame(iframe)
338+
checkbox = driver.find_element(name: 'scroll_checkbox')
339+
expect(in_viewport?(checkbox)).to eq true
340+
end
341341

342-
it 'throws MoveTargetOutOfBoundsError when origin offset is out of viewport' do
343-
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame.html')
342+
it 'throws MoveTargetOutOfBoundsError when origin offset is out of viewport' do
343+
driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame.html')
344344

345-
expect {
346-
driver.action.scroll_by(0, 200, origin_x: -10, origin_y: -10).perform
347-
}.to raise_error(Error::MoveTargetOutOfBoundsError)
345+
expect {
346+
driver.action.scroll_by(0, 200, origin_x: -10, origin_y: -10).perform
347+
}.to raise_error(Error::MoveTargetOutOfBoundsError)
348+
end
348349
end
349350
end # ActionBuilder
350351
end # WebDriver

‎rb/spec/unit/selenium/webdriver/common/interactions/pointer_input_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ module Interactions
7474

7575
describe '#create_pointer_down' do
7676
it 'executes #add_action with created interaction' do
77-
allow(PointerPress).to receive(:new).with(pointer, :down, :left).and_return(interaction)
77+
allow(PointerPress).to receive(:new).with(pointer, :down, :left, {}).and_return(interaction)
7878
allow(pointer).to receive(:add_action).and_call_original
7979

8080
pointer.create_pointer_down(:left)
@@ -85,7 +85,7 @@ module Interactions
8585

8686
describe '#create_pointer_up' do
8787
it 'executes #add_action with created interaction' do
88-
allow(PointerPress).to receive(:new).with(pointer, :up, :left).and_return(interaction)
88+
allow(PointerPress).to receive(:new).with(pointer, :up, :left, {}).and_return(interaction)
8989
allow(pointer).to receive(:add_action).and_call_original
9090

9191
pointer.create_pointer_up(:left)

0 commit comments

Comments
 (0)