Merge remote-tracking branch 'upstream/pull/6168'

[rails.git] / test / controllers / api / messages / inboxes_controller_test.rb

diff --git a/test/controllers/api/messages/inboxes_controller_test.rb b/test/controllers/api/messages/inboxes_controller_test.rb
index f863146ca9f7fa61f0d9d4a29263737895e05cae..1f6c51878bf8323f3c6750396c8a53211c81ed90 100644 (file)
--- a/test/controllers/api/messages/inboxes_controller_test.rb
+++ b/test/controllers/api/messages/inboxes_controller_test.rb
@@ -105,11 +105,11 @@ module Api
           jsm = js["messages"]
           assert_operator jsm.count, :<=, 20
 
-          break if jsm.nil? || jsm.count.zero?
+          break if jsm.nil? || jsm.none?
 
           assert_operator(jsm[0]["id"], :>=, params[:from_id]) unless params[:from_id].nil?
           # ensure ascending order
-          (0..jsm.count - 1).each do |i|
+          (0..(jsm.count - 1)).each do |i|
             assert_operator(jsm[i]["id"], :<, jsm[i + 1]["id"]) unless i == jsm.count - 1
             msgs_read[jsm[i]["id"]] = jsm[i]
           end
@@ -139,7 +139,7 @@ module Api
           jsm = js["messages"]
           assert_operator jsm.count, :<=, 20
 
-          break if jsm.nil? || jsm.count.zero?
+          break if jsm.nil? || jsm.none?
 
           if params[:from_id].nil?
             real_max_id = jsm[0]["id"]
@@ -147,7 +147,7 @@ module Api
             assert_operator jsm[0]["id"], :<=, params[:from_id]
           end
           # ensure descending order
-          (0..jsm.count - 1).each do |i|
+          (0..(jsm.count - 1)).each do |i|
             assert_operator(jsm[i]["id"], :>, jsm[i + 1]["id"]) unless i == jsm.count - 1
             msgs_read[jsm[i]["id"]] = jsm[i]
           end