kotovalexarian-likes-github
/
teamcapybara--capybara
mirror of https://github.com/teamcapybara/capybara.git
1
0
Fork 0
Code Releases Activity

make locator optional in finders

This commit is contained in:
Thomas Walpole 2016-04-13 13:50:37 -07:00
parent 96c57b3c0b
commit 5385ff0116
4 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/capybara/node/finders.rb
View File

@ -51,22 +51,26 @@ module Capybara
#
# Find a form field on the page. The field can be found by its name, id or label text.
#
# @macro waiting_behavior
# @overload find_field([locator], options={})
# @param [String] locator name, id, placeholder or text of associated label element
#
# @param [String] locator Which field to find
# @macro waiting_behavior
#
# @option options [Boolean] checked Match checked field?
# @option options [Boolean] unchecked Match unchecked field?
# @option options [Boolean, Symbol] disabled (false) Match disabled field?
# * true - only finds a disabled field
# * false - only finds an enabled field
# * :all - finds either an enabled or disabled field
# @option options [Boolean] readonly Match readonly field?
# @option options [String] with Value of field to match on
# @option options [String] type Type of field to match on
#
# @option options [Boolean] checked Match checked field?
# @option options [Boolean] unchecked Match unchecked field?
# @option options [Boolean, Symbol] disabled (false) Match disabled field?
# * true - only finds a disabled field
# * false - only finds an enabled field
# * :all - finds either an enabled or disabled field
# @option options [Boolean] readonly Match readonly field?
# @option options [String] with Value of field to match on
# @option options [String] type Type of field to match on
# @return [Capybara::Node::Element] The found element
#
def find_field(locator, options={})
def find_field(locator=nil, options={})
locator, options = nil, locator if locator.is_a? Hash
find(:field, locator, options)
end
alias_method :field_labeled, :find_field
@ -75,13 +79,16 @@ module Capybara
#
# Find a link on the page. The link can be found by its id or text.
#
# @macro waiting_behavior
# @overload find_link([locator], options={})
# @param [String] locator id, title, text, or alt of enclosed img element
#
# @param [String] locator Which link to find
# @option options [String,Regexp] href Value to match against the links href
# @macro waiting_behavior
#
# @option options [String,Regexp] href Value to match against the links href
# @return [Capybara::Node::Element] The found element
#
def find_link(locator, options={})
def find_link(locator=nil, options={})
locator, options = nil, locator if locator.is_a? Hash
find(:link, locator, options)
end
@ -91,17 +98,22 @@ module Capybara
# This can be any \<input> element of type submit, reset, image, button or it can be a
# \<button> element. All buttons can be found by their id, value, or title. \<button> elements can also be found
# by their text content, and image \<input> elements by their alt attribute
# @macro waiting_behavior
#
# @param [String] locator Which button to find
# @option options [Boolean, Symbol] disabled (false) Match disabled button?
# * true - only finds a disabled button
# * false - only finds an enabled button
# * :all - finds either an enabled or disabled button
# @overload find_button([locator], options={})
# @param [String] locator id, value, title, text content, alt of image
#
# @overload find_button(options={})
#
# @macro waiting_behavior
#
# @option options [Boolean, Symbol] disabled (false) Match disabled button?
# * true - only finds a disabled button
# * false - only finds an enabled button
# * :all - finds either an enabled or disabled button
# @return [Capybara::Node::Element] The found element
#
def find_button(locator, options={})
def find_button(locator=nil, options={})
locator, options = nil, locator if locator.is_a? Hash
find(:button, locator, options)
end
@ -111,7 +123,7 @@ module Capybara
#
# @macro waiting_behavior
#
# @param [String] id Which element to find
# @param [String] id id of element
#
# @return [Capybara::Node::Element] The found element
#

6
lib/capybara/spec/session/find_button_spec.rb
View File

@ -52,4 +52,10 @@ Capybara::SpecHelper.spec '#find_button' do
expect(@session.find_button('Disabled button', :disabled => :all).value).to eq("Disabled button")
end
end
context "without locator" do
it "should use options" do
expect(@session.find_button(disabled: true).value).to eq("Disabled button")
end
end
end

7
lib/capybara/spec/session/find_field_spec.rb
View File

@ -71,7 +71,6 @@ Capybara::SpecHelper.spec '#find_field' do
end
end
context 'with :readonly option' do
it "should find readonly fields when true" do
expect(@session.find_field('form[readonly_test]', readonly: true)[:id]).to eq 'readonly'
@ -87,4 +86,10 @@ Capybara::SpecHelper.spec '#find_field' do
end.to raise_error(Capybara::Ambiguous, /found 2 elements/)
end
end
context 'with no locator', locator: true do
it 'should use options to find the field' do
expect(@session.find_field(with: 'dog')['id']).to eq "form_pets_dog"
end
end
end

6
lib/capybara/spec/session/find_link_spec.rb
View File

@ -30,4 +30,10 @@ Capybara::SpecHelper.spec '#find_link' do
end.to raise_error(Capybara::ElementNotFound)
end
end
context "without locator" do
it "should use options" do
expect(@session.find_link(href: '#anchor').text).to eq "Normal Anchor"
end
end
end