From cdacac8c6cbd85ed6e8a1cac8ce6fa5994094c7c Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sun, 1 Oct 2017 06:06:09 +0900 Subject: [PATCH] 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 --- .../settings/follower_domains_controller.rb | 2 +- .../follower_domains_controller_spec.rb | 67 ++++++++++++++++--- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/app/controllers/settings/follower_domains_controller.rb b/app/controllers/settings/follower_domains_controller.rb index 90b48887f..9968504e5 100644 --- a/app/controllers/settings/follower_domains_controller.rb +++ b/app/controllers/settings/follower_domains_controller.rb @@ -9,7 +9,7 @@ class Settings::FollowerDomainsController < ApplicationController def show @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 def update diff --git a/spec/controllers/settings/follower_domains_controller_spec.rb b/spec/controllers/settings/follower_domains_controller_spec.rb index d48c3e68c..333223c61 100644 --- a/spec/controllers/settings/follower_domains_controller_spec.rb +++ b/spec/controllers/settings/follower_domains_controller_spec.rb @@ -5,15 +5,41 @@ describe Settings::FollowerDomainsController do let(:user) { Fabricate(:user) } - before do - sign_in user, scope: :user + shared_examples 'authenticate user' do + it 'redirects when not signed in' do + is_expected.to redirect_to '/auth/sign_in' + end end 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 - get :show + sign_in user, scope: :user + subject expect(response).to have_http_status(:success) end + + include_examples 'authenticate user' end describe 'PATCH #update' do @@ -21,16 +47,39 @@ describe Settings::FollowerDomainsController do before do stub_request(:post, 'http://example.com/salmon').to_return(status: 200) - poopfeast.follow!(user.account) - patch :update, params: { select: ['example.com'] } end - it 'redirects back to followers page' do - expect(response).to redirect_to(settings_follower_domains_path) + shared_examples 'redirects back to followers page' do |notice| + 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 - it 'soft-blocks followers from selected domains' do - expect(poopfeast.following?(user.account)).to be false + context 'when select parameter is not provided' do + 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