diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 13:52:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 14:14:20 +0100 |
commit | 4df3b7cb067797982199c3e613ba32a9c7474348 (patch) | |
tree | bf237d385411f73e670af4c744d8239ab4799434 /spec/controllers/settings | |
parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
parent | 1a0d3c9c65d663210494ec9b55912debad6331f5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
Diffstat (limited to 'spec/controllers/settings')
-rw-r--r-- | spec/controllers/settings/follower_domains_controller_spec.rb | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/spec/controllers/settings/follower_domains_controller_spec.rb b/spec/controllers/settings/follower_domains_controller_spec.rb deleted file mode 100644 index 6d415a654..000000000 --- a/spec/controllers/settings/follower_domains_controller_spec.rb +++ /dev/null @@ -1,85 +0,0 @@ -require 'rails_helper' - -describe Settings::FollowerDomainsController do - render_views - - let(:user) { Fabricate(: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 - sign_in user, scope: :user - subject - expect(response).to have_http_status(200) - end - - include_examples 'authenticate user' - 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) - end - - 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 - - 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 |