Use "match_array" only for order independent assertions (#3626)

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 9370dcdadf4d878e16d72cc9d7b3edf813d21ba9..6a54a78c56654a7c848df29450953ebd28eace6c 100644 (file)
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -266,7 +266,7 @@ describe ApplicationController, type: :controller do
     shared_examples 'receives :with_includes' do |fabricator, klass|
       it 'uses raw if it is not an ActiveRecord::Relation' do
         record = Fabricate(fabricator)
-        expect(C.new.cache_collection([record], klass)).to match_array([record])
+        expect(C.new.cache_collection([record], klass)).to eq [record]
       end
     end
 
@@ -277,7 +277,7 @@ describe ApplicationController, type: :controller do
         record = Fabricate(fabricator)
         relation = klass.none
         allow(relation).to receive(:cache_ids).and_return([record])
-        expect(C.new.cache_collection(relation, klass)).to match_array([record])
+        expect(C.new.cache_collection(relation, klass)).to eq [record]
       end
     end
 

diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index c329996c8bc3967dd94c9918c9cce5045be8fc58..88d365624e32bbd05d64862286bc89c662daaa22 100644 (file)
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -61,7 +61,7 @@ describe StatusesController do
 
         get :show, params: { account_username: status.account.username, id: status.id }
 
-        expect(assigns(:ancestors)).to match_array([ancestor])
+        expect(assigns(:ancestors)).to eq [ancestor]
       end
 
       it 'assigns @ancestors for [] if it is not a reply' do

diff --git a/spec/controllers/stream_entries_controller_spec.rb b/spec/controllers/stream_entries_controller_spec.rb
index db7c52037e1349e37542893afdd98065545737c8..2cc428e0c1be90b0394b0efaf3b4b70b674adfa5 100644 (file)
--- a/spec/controllers/stream_entries_controller_spec.rb
+++ b/spec/controllers/stream_entries_controller_spec.rb
@@ -73,8 +73,8 @@ RSpec.describe StreamEntriesController, type: :controller do
 
       get :show, params: { account_username: status.account.username, id: status.stream_entry.id }
 
-      expect(assigns(:ancestors)).to match_array([ancestor])
-      expect(assigns(:descendants)).to match_array([descendant])
+      expect(assigns(:ancestors)).to eq [ancestor]
+      expect(assigns(:descendants)).to eq [descendant]
       expect(response).to have_http_status(:success)
     end
 

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 735c78c645469e4e85fc9a1f7a0b36acc618e051..9cb36d46761ee5fd8e7dec7d907c6873979fd265 100644 (file)
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe User, type: :model do
       it 'returns an array of recent users ordered by id' do
         user_1 = Fabricate(:user)
         user_2 = Fabricate(:user)
-        expect(User.recent).to match_array([user_2, user_1])
+        expect(User.recent).to eq [user_2, user_1]
       end
     end
 
@@ -92,7 +92,7 @@ RSpec.describe User, type: :model do
         ]
         Fabricate(:user, current_sign_in_ip: '0.0.0.0', last_sign_in_ip: '0.0.0.0')
 
-        expect(User.with_recent_ip_address('0.0.0.42')).to eq specifieds
+        expect(User.with_recent_ip_address('0.0.0.42')).to match_array(specifieds)
       end
     end
   end