diff options
| author | Timm <kaspth@gmail.com> | 2013-08-14 17:18:15 +0200 |
|---|---|---|
| committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:06 +0200 |
| commit | bffa6469b7efc8a56074ed6f8d31e9e01e685648 (patch) | |
| tree | 6cfb3a439abc2194899e378bd2486e2454bcd2ec /actionview/lib/action_view/testing/assertions | |
| parent | 5a14dbf521daa70aeba10f1445c960b8c62467d5 (diff) | |
| download | rails-bffa6469b7efc8a56074ed6f8d31e9e01e685648.tar.gz rails-bffa6469b7efc8a56074ed6f8d31e9e01e685648.tar.bz2 rails-bffa6469b7efc8a56074ed6f8d31e9e01e685648.zip | |
Reworked root and selector conditional assignment in css_select.
Diffstat (limited to 'actionview/lib/action_view/testing/assertions')
| -rw-r--r-- | actionview/lib/action_view/testing/assertions/selector.rb | 7 |
1 files changed, 2 insertions, 5 deletions
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) |