aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-07-31 22:21:22 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:03:59 +0200
commit91650ddc3a38d46b254e5fd8ab3cc7a5823ed9ce (patch)
tree3629757067b3dd56a3ae577b852bdecfdbe6f238
parentf1031225f67fc3ee23b68c068f31d5099d00f11d (diff)
downloadrails-91650ddc3a38d46b254e5fd8ab3cc7a5823ed9ce.tar.gz
rails-91650ddc3a38d46b254e5fd8ab3cc7a5823ed9ce.tar.bz2
rails-91650ddc3a38d46b254e5fd8ab3cc7a5823ed9ce.zip
Fixed: no longer wrapped @selected in fragment, since .css works fine without it.
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index e551851ed6..c2a5d59577 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -374,12 +374,11 @@ module ActionDispatch
root_or_selector
elsif @selected
- # nested call - wrap in document
if @selected.is_a?(Array)
doc = @selected.empty? ? @page.document : @selected[0].document
@selected = Nokogiri::XML::NodeSet.new(doc, @selected)
end
- Loofah.fragment('').tap { |d| d.add_child @selected }
+ @selected
else
@page
end