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

small Selector cleanup

Browse source
This commit is contained in:
Thomas Walpole 2016-04-06 12:42:02 -07:00
parent abc1b7007f
commit f5ec0dfc7f
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/capybara/selector.rb
View file

@ -31,24 +31,19 @@ module Capybara
@label = nil
@failure_message = nil
@description = nil
@format = nil
@expression = nil
instance_eval(&block)
end
def xpath(&block)
if block
@format = :xpath
@xpath, @css = block, nil
end
@xpath
@format, @expression = :xpath, block if block
format == :xpath ? @expression : nil
end
# Same as xpath, but wrap in XPath.css().
def css(&block)
if block
@format = :css
@css, @xpath = block, nil
end
@css
@format, @expression = :css, block if block
format == :css ? @expression : nil
end
def match(&block)
@ -66,10 +61,10 @@ module Capybara
end
def call(locator)
if @format==:css
@css.call(locator)
if format
@expression.call(locator)
else
@xpath.call(locator)
warn "Selector has no format"
end
end