From bffa6469b7efc8a56074ed6f8d31e9e01e685648 Mon Sep 17 00:00:00 2001 From: Timm Date: Wed, 14 Aug 2013 17:18:15 +0200 Subject: Reworked root and selector conditional assignment in css_select. --- actionview/lib/action_view/testing/assertions/selector.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'actionview/lib/action_view/testing/assertions') diff --git a/actionview/lib/action_view/testing/assertions/selector.rb b/actionview/lib/action_view/testing/assertions/selector.rb index dc847e5ccf..c2ea25c8a3 100644 --- a/actionview/lib/action_view/testing/assertions/selector.rb +++ b/actionview/lib/action_view/testing/assertions/selector.rb @@ -49,11 +49,8 @@ module ActionView def css_select(*args) raise ArgumentError, "you at least need a selector" if args.empty? - if args.first.is_a?(String) - root, selector = response_from_page, args.first - else - root, selector = args.shift, args.first - end + root = args.size == 1 ? response_from_page : args.shift + selector = args.first root.css(selector).tap do |matches| if matches.empty? && root.matches?(selector) -- cgit v1.2.3