kotovalexarian-likes-github/teamcapybara--capybara
1
0
Fork 0
mirror of https://github.com/teamcapybara/capybara.git synced 2022-11-09 12:08:07 -05:00
Code Releases Activity

remove support for Driver#within_frame

Browse source
This commit is contained in:
Thomas Walpole 2016-08-17 14:07:44 -07:00
parent 1bb9a73c9e
commit 71f0c8578f
1 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/capybara/session.rb
View file

@ -418,30 +418,12 @@ module Capybara
# @overload within_frame(index) # @overload within_frame(index)
# @param [Integer] index index of a frame (0 based) # @param [Integer] index index of a frame (0 based)
def within_frame(*args) def within_frame(*args)
frame = _find_frame(*args) switch_to_frame(_find_frame(*args))
begin
switch_to_frame(frame)
begin begin
yield yield
ensure ensure
switch_to_frame(:parent) switch_to_frame(:parent)
end end
rescue Capybara::NotSupportedByDriverError
# Support older driver frame API for now
if driver.respond_to?(:within_frame)
begin
scopes.push(:frame)
driver.within_frame(frame) do
yield
end
ensure
scopes.pop
end
else
raise
end
end
end end
## ##
@ -915,7 +897,6 @@ module Capybara
end end
def _find_frame(*args) def _find_frame(*args)
within(document) do # Previous 2.x versions ignored current scope when finding frames - consider changing in 3.0
case args[0] case args[0]
when Capybara::Node::Element when Capybara::Node::Element
args[0] args[0]
@ -930,7 +911,6 @@ module Capybara
raise TypeError raise TypeError
end end
end end
end
def _switch_to_window(window = nil, options= {}) def _switch_to_window(window = nil, options= {})
options, window = window, nil if window.is_a? Hash options, window = window, nil if window.is_a? Hash