mirror of
https://github.com/teamcapybara/capybara.git
synced 2022-11-09 12:08:07 -05:00
Minor code cleanup
This commit is contained in:
parent
0e9c4aae37
commit
9856938e59
9 changed files with 10 additions and 9 deletions
|
@ -75,7 +75,7 @@ module Capybara
|
||||||
|
|
||||||
filter = %r{lib/capybara/|lib/rspec/|lib/minitest/}
|
filter = %r{lib/capybara/|lib/rspec/|lib/minitest/}
|
||||||
new_trace = trace.take_while { |line| line !~ filter }
|
new_trace = trace.take_while { |line| line !~ filter }
|
||||||
new_trace = trace.reject { |line| line =~ filter } if new_trace.empty?
|
new_trace = trace.grep_v(filter) if new_trace.empty?
|
||||||
new_trace = trace.dup if new_trace.empty?
|
new_trace = trace.dup if new_trace.empty?
|
||||||
|
|
||||||
new_trace.first.split(/:in /, 2).first
|
new_trace.first.split(/:in /, 2).first
|
||||||
|
|
|
@ -216,7 +216,7 @@ private
|
||||||
min, max, step = (native['min'] || 0).to_f, (native['max'] || 100).to_f, (native['step'] || 1).to_f
|
min, max, step = (native['min'] || 0).to_f, (native['max'] || 100).to_f, (native['step'] || 1).to_f
|
||||||
value = value.to_f
|
value = value.to_f
|
||||||
value = value.clamp(min, max)
|
value = value.clamp(min, max)
|
||||||
value = ((value - min) / step).round * step + min
|
value = (((value - min) / step).round * step) + min
|
||||||
native['value'] = value.clamp(min, max)
|
native['value'] = value.clamp(min, max)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ module Capybara
|
||||||
when '"', "'"
|
when '"', "'"
|
||||||
selector << parse_string(char, str)
|
selector << parse_string(char, str)
|
||||||
when '\\'
|
when '\\'
|
||||||
selector << char + str.getc
|
selector << (char + str.getc)
|
||||||
when ','
|
when ','
|
||||||
selectors << selector.strip
|
selectors << selector.strip
|
||||||
selector.clear
|
selector.clear
|
||||||
|
|
|
@ -63,6 +63,7 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
|
||||||
|
|
||||||
def visible?
|
def visible?
|
||||||
return super unless native_displayed?
|
return super unless native_displayed?
|
||||||
|
|
||||||
begin
|
begin
|
||||||
bridge.send(:execute, :is_element_displayed, id: native_id)
|
bridge.send(:execute, :is_element_displayed, id: native_id)
|
||||||
rescue Selenium::WebDriver::Error::UnknownCommandError
|
rescue Selenium::WebDriver::Error::UnknownCommandError
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue