aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-03-22 18:52:03 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2014-03-22 18:52:03 -0700
commitbcf3a82f939075b4f4d63adc4b103a0cc8b0a76d (patch)
tree0b31e059da70d8dcbb9243fd89b8f634e6a330ed /actionpack/lib/action_dispatch
parent9d44b3f886847eee9c70097165863f8e37d3d1d8 (diff)
parent0ebae1dbc59c34f6b5ae87bf96b8848051a0254c (diff)
downloadrails-bcf3a82f939075b4f4d63adc4b103a0cc8b0a76d.tar.gz
rails-bcf3a82f939075b4f4d63adc4b103a0cc8b0a76d.tar.bz2
rails-bcf3a82f939075b4f4d63adc4b103a0cc8b0a76d.zip
Merge pull request #14450 from vlal/vlal-rails
Incorrect values being printed by assert_select.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 3253a3d424..8a128427bf 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -291,7 +291,7 @@ module ActionDispatch
# so is this custom message really needed?
message = message || %(Expected #{count_description(min, max, count)} matching "#{selector.to_s}", found #{matches.size}.)
if count
- assert_equal matches.size, count, message
+ assert_equal count, matches.size, message
else
assert_operator matches.size, :>=, min, message if min
assert_operator matches.size, :<=, max, message if max