1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00

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

This commit is contained in:
unarist 2017-06-08 01:59:28 +09:00 committed by Matt Jankowski
parent d3bbef27e7
commit 0f1b1d78b1
4 changed files with 7 additions and 7 deletions

View file

@ -266,7 +266,7 @@ describe ApplicationController, type: :controller do
shared_examples 'receives :with_includes' do |fabricator, klass| shared_examples 'receives :with_includes' do |fabricator, klass|
it 'uses raw if it is not an ActiveRecord::Relation' do it 'uses raw if it is not an ActiveRecord::Relation' do
record = Fabricate(fabricator) 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
end end
@ -277,7 +277,7 @@ describe ApplicationController, type: :controller do
record = Fabricate(fabricator) record = Fabricate(fabricator)
relation = klass.none relation = klass.none
allow(relation).to receive(:cache_ids).and_return([record]) 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
end end

View file

@ -61,7 +61,7 @@ describe StatusesController do
get :show, params: { account_username: status.account.username, id: status.id } 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 end
it 'assigns @ancestors for [] if it is not a reply' do it 'assigns @ancestors for [] if it is not a reply' do

View file

@ -73,8 +73,8 @@ RSpec.describe StreamEntriesController, type: :controller do
get :show, params: { account_username: status.account.username, id: status.stream_entry.id } get :show, params: { account_username: status.account.username, id: status.stream_entry.id }
expect(assigns(:ancestors)).to match_array([ancestor]) expect(assigns(:ancestors)).to eq [ancestor]
expect(assigns(:descendants)).to match_array([descendant]) expect(assigns(:descendants)).to eq [descendant]
expect(response).to have_http_status(:success) expect(response).to have_http_status(:success)
end end

View file

@ -46,7 +46,7 @@ RSpec.describe User, type: :model do
it 'returns an array of recent users ordered by id' do it 'returns an array of recent users ordered by id' do
user_1 = Fabricate(:user) user_1 = Fabricate(:user)
user_2 = 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
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') 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 end
end end