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

Merge pull request #1309 from twalpole/visible_optimization

Browse source 
Optimization of Capybara::RackTest::Node#unnormalized_text while checking visibility
This commit is contained in:
Thomas Walpole 2014-05-20 18:07:18 -07:00
commit 3c5dd37a93
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/capybara/node/simple.rb
View file

@ -94,10 +94,17 @@ module Capybara
# Whether or not the element is visible. Does not support CSS, so # Whether or not the element is visible. Does not support CSS, so
# the result may be inaccurate. # the result may be inaccurate.
# #
# @param [Boolean] check_ancestors Whether to inherit visibility from ancestors
# @return [Boolean] Whether the element is visible # @return [Boolean] Whether the element is visible
# #
def visible? def visible?(check_ancestors = true)
native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none') or @hidden or name()='script' or name()='head']").size == 0 if check_ancestors
#check size because oldest supported nokogiri doesnt support xpath boolean() function
native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none') or @hidden or name()='script' or name()='head']").size() == 0
else
#no need for an xpath if only checking the current element
!(native.has_attribute?('hidden') || (native[:style] =~ /display:\s?none/) || %w(script head).include?(tag_name))
end
end end
## ##

6
lib/capybara/rack_test/node.rb
View file

@ -99,14 +99,14 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
protected protected
def unnormalized_text def unnormalized_text(check_ancestor_visibility = true)
if !visible? if !string_node.visible?(check_ancestor_visibility)
'' ''
elsif native.text? elsif native.text?
native.text native.text
elsif native.element? elsif native.element?
native.children.map do |child| native.children.map do |child|
Capybara::RackTest::Node.new(driver, child).unnormalized_text Capybara::RackTest::Node.new(driver, child).unnormalized_text(false)
end.join end.join
else else
'' ''

5
lib/capybara/spec/session/text_spec.rb
View file

@ -34,6 +34,11 @@ Capybara::SpecHelper.spec '#text' do
Capybara.ignore_hidden_elements = false Capybara.ignore_hidden_elements = false
expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is') expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
end end
it "ignores invisible text if ancestor is invisible" do
@session.visit('/with_html')
expect(@session.find(:id, "hidden_via_ancestor", visible: false).text).to eq('')
end
context "with css as default selector" do context "with css as default selector" do
before { Capybara.default_selector = :css } before { Capybara.default_selector = :css }