From 501514960a9de238e23cd607d2e8f4c1ff9f16c1 Mon Sep 17 00:00:00 2001 From: Eugen Date: Mon, 24 Apr 2017 00:38:37 +0200 Subject: Followers-only post federation (#2111) * Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account --- .../settings/follower_domains_controller_spec.rb | 34 ++++++++++++++++++++++ .../settings/preferences_controller_spec.rb | 6 ++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 spec/controllers/settings/follower_domains_controller_spec.rb (limited to 'spec/controllers') diff --git a/spec/controllers/settings/follower_domains_controller_spec.rb b/spec/controllers/settings/follower_domains_controller_spec.rb new file mode 100644 index 000000000..1afdb9757 --- /dev/null +++ b/spec/controllers/settings/follower_domains_controller_spec.rb @@ -0,0 +1,34 @@ +require 'rails_helper' + +describe Settings::FollowerDomainsController do + let(:user) { Fabricate(:user) } + + before do + sign_in user, scope: :user + end + + describe 'GET #show' do + it 'returns http success' do + get :show + expect(response).to have_http_status(:success) + end + end + + describe 'PATCH #update' do + let(:poopfeast) { Fabricate(:account, username: 'poopfeast', domain: 'example.com', salmon_url: 'http://example.com/salmon') } + + 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) + end + + it 'soft-blocks followers from selected domains' do + expect(poopfeast.following?(user.account)).to be false + end + end +end diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb index cdf595d4d..0d3dc059a 100644 --- a/spec/controllers/settings/preferences_controller_spec.rb +++ b/spec/controllers/settings/preferences_controller_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' describe Settings::PreferencesController do let(:user) { Fabricate(:user) } + before do sign_in user, scope: :user end @@ -9,13 +10,12 @@ describe Settings::PreferencesController do describe 'GET #show' do it 'returns http success' do get :show - expect(response).to have_http_status(:success) end end describe 'PUT #update' do - it 'udpates the user record' do + it 'updates the user record' do put :update, params: { user: { locale: 'en' } } expect(response).to redirect_to(settings_preferences_path) @@ -31,7 +31,7 @@ describe Settings::PreferencesController do user: { setting_boost_modal: '1', notification_emails: { follow: '1' }, - interactions: { must_be_follower: '0' } + interactions: { must_be_follower: '0' }, } } -- cgit