Fix order of paginated accounts in FollowerDomainsController and spec (#3357)

* Fix order of paginated accounts in FollowerDomainsController

Unordered pagination could result in unexpected behavior.

* Cover Settings::FollowerDomainsController more
This commit is contained in:
Akihiko Odaki 2017-10-01 06:06:09 +09:00 committed by Eugen Rochko
parent eb605141ff
commit cdacac8c6c
2 changed files with 59 additions and 10 deletions

View file

@ -9,7 +9,7 @@ class Settings::FollowerDomainsController < ApplicationController
def show def show
@account = current_account @account = current_account
@domains = current_account.followers.reorder(nil).group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10) @domains = current_account.followers.reorder('MIN(follows.id) DESC').group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10)
end end
def update def update

View file

@ -5,15 +5,41 @@ describe Settings::FollowerDomainsController do
let(:user) { Fabricate(:user) } let(:user) { Fabricate(:user) }
before do shared_examples 'authenticate user' do
sign_in user, scope: :user it 'redirects when not signed in' do
is_expected.to redirect_to '/auth/sign_in'
end
end end
describe 'GET #show' do describe 'GET #show' do
subject { get :show, params: { page: 2 } }
it 'assigns @account' do
sign_in user, scope: :user
subject
expect(assigns(:account)).to eq user.account
end
it 'assigns @domains' do
Fabricate(:account, domain: 'old').follow!(user.account)
Fabricate(:account, domain: 'recent').follow!(user.account)
sign_in user, scope: :user
subject
assigned = assigns(:domains).per(1).to_a
expect(assigned.size).to eq 1
expect(assigned[0].accounts_from_domain).to eq 1
expect(assigned[0].domain).to eq 'old'
end
it 'returns http success' do it 'returns http success' do
get :show sign_in user, scope: :user
subject
expect(response).to have_http_status(:success) expect(response).to have_http_status(:success)
end end
include_examples 'authenticate user'
end end
describe 'PATCH #update' do describe 'PATCH #update' do
@ -21,16 +47,39 @@ describe Settings::FollowerDomainsController do
before do before do
stub_request(:post, 'http://example.com/salmon').to_return(status: 200) stub_request(:post, 'http://example.com/salmon').to_return(status: 200)
poopfeast.follow!(user.account)
patch :update, params: { select: ['example.com'] }
end end
it 'redirects back to followers page' do shared_examples 'redirects back to followers page' do |notice|
expect(response).to redirect_to(settings_follower_domains_path) it 'redirects back to followers page' do
poopfeast.follow!(user.account)
sign_in user, scope: :user
subject
expect(flash[:notice]).to eq notice
expect(response).to redirect_to(settings_follower_domains_path)
end
end end
it 'soft-blocks followers from selected domains' do context 'when select parameter is not provided' do
expect(poopfeast.following?(user.account)).to be false subject { patch :update }
include_examples 'redirects back to followers page', 'In the process of soft-blocking followers from 0 domains...'
end
context 'when select parameter is provided' do
subject { patch :update, params: { select: ['example.com'] } }
it 'soft-blocks followers from selected domains' do
poopfeast.follow!(user.account)
sign_in user, scope: :user
subject
expect(poopfeast.following?(user.account)).to be false
end
include_examples 'authenticate user'
include_examples 'redirects back to followers page', 'In the process of soft-blocking followers from one domain...'
end end
end end
end end