diff options
| author | Timm <kaspth@gmail.com> | 2013-08-16 20:52:34 +0200 |
|---|---|---|
| committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:08 +0200 |
| commit | cabef1415ad18063090f8fb2a48291355e536b0c (patch) | |
| tree | 5b1f2fe3627658bfd01e4ee5a7badadf18ffa309 /actionview/lib/action_view | |
| parent | 65ed2b6371817e9110c2eecab080f952ea0e9667 (diff) | |
| download | rails-cabef1415ad18063090f8fb2a48291355e536b0c.tar.gz rails-cabef1415ad18063090f8fb2a48291355e536b0c.tar.bz2 rails-cabef1415ad18063090f8fb2a48291355e536b0c.zip | |
Changed: using duck typing instead of requiring subclasses of Node and NodeSet.
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/testing/assertions/selector.rb | 5 |
1 files changed, 1 insertions, 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) |