From 4b55c0aa2e923e6102c9f80e12bbfde4431a7412 Mon Sep 17 00:00:00 2001 From: Timm Date: Fri, 16 Aug 2013 20:53:55 +0200 Subject: Moved: initial assignment of @selector_is_second_argument is now in initialize. --- actionview/lib/action_view/testing/assertions/selector.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionview/lib/action_view/testing/assertions/selector.rb') diff --git a/actionview/lib/action_view/testing/assertions/selector.rb b/actionview/lib/action_view/testing/assertions/selector.rb index bbdb21f4b0..73f31c2127 100644 --- a/actionview/lib/action_view/testing/assertions/selector.rb +++ b/actionview/lib/action_view/testing/assertions/selector.rb @@ -311,6 +311,7 @@ module ActionView def initialize(selected, page, args) # Start with possible optional element followed by mandatory selector. + @selector_is_second_argument = false @root = determine_root_from(args.first, page, selected) @selector = extract_selector(args) @@ -354,7 +355,6 @@ module ActionView end def determine_root_from(root_or_selector, page, previous_selection = nil) - @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.respond_to?(:css) -- cgit v1.2.3