aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-07-23 15:20:15 +0200
committerTimm <kaspth@gmail.com>2014-06-15 23:41:00 +0200
commit11fc26b96f6c51643aced40e4522c74036c7458d (patch)
tree834276b7d03f43b989e323ec2cb0cde58c7a6656 /actionpack
parent240ce95a837590432b1a2a7fc56ebbe31fffc539 (diff)
downloadrails-11fc26b96f6c51643aced40e4522c74036c7458d.tar.gz
rails-11fc26b96f6c51643aced40e4522c74036c7458d.tar.bz2
rails-11fc26b96f6c51643aced40e4522c74036c7458d.zip
Initialized @css_selector_is_second_argument in determine_root_from.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 7a1176485e..02f59e3db3 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -364,6 +364,7 @@ module ActionDispatch
end
def determine_root_from(root_or_selector)
+ @css_selector_is_second_argument = false
if root_or_selector == nil
raise ArgumentError, "First argument is either selector or element to select, but nil found. Perhaps you called assert_select with an element that does not exist?"
elsif root_or_selector.is_a?(Nokogiri::XML::Node)