From cabef1415ad18063090f8fb2a48291355e536b0c Mon Sep 17 00:00:00 2001 From: Timm Date: Fri, 16 Aug 2013 20:52:34 +0200 Subject: Changed: using duck typing instead of requiring subclasses of Node and NodeSet. --- actionview/lib/action_view/testing/assertions/selector.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/actionview/lib/action_view/testing/assertions/selector.rb b/actionview/lib/action_view/testing/assertions/selector.rb index d7266d4e99..bbdb21f4b0 100644 --- a/actionview/lib/action_view/testing/assertions/selector.rb +++ b/actionview/lib/action_view/testing/assertions/selector.rb @@ -357,11 +357,8 @@ module ActionView @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) || root_or_selector.is_a?(Nokogiri::XML::NodeSet) - # First argument is a node (tag or text, but also HTML root), - # so we know what we're selecting from. + elsif root_or_selector.respond_to?(:css) @selector_is_second_argument = true - root_or_selector elsif previous_selection if previous_selection.is_a?(Array) -- cgit v1.2.3