diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2021-01-10 11:17:55 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-10 11:17:55 +0900 |
commit | 98a2603dc163210d3a0aab0a0c2b8ef74c7e5eb0 (patch) | |
tree | 761694d2d697c58faf02a3ff9ef26bf045fc0274 /spec/controllers/settings/deletes_controller_spec.rb | |
parent | 7cd4ed7d4298626d2b141cd6d8378e95bc248824 (diff) | |
parent | 087ed84367537ac168ed3e00bb7eb4bd582dc3d0 (diff) | |
download | mastodon-feature-limited-visibility-bearcaps.tar mastodon-feature-limited-visibility-bearcaps.tar.gz mastodon-feature-limited-visibility-bearcaps.tar.bz2 mastodon-feature-limited-visibility-bearcaps.zip |
Merge branch 'master' into feature-limited-visibility-bearcapsfeature-limited-visibility-bearcaps
Diffstat (limited to 'spec/controllers/settings/deletes_controller_spec.rb')
-rw-r--r-- | spec/controllers/settings/deletes_controller_spec.rb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb index 996872efd..8d5c4774f 100644 --- a/spec/controllers/settings/deletes_controller_spec.rb +++ b/spec/controllers/settings/deletes_controller_spec.rb @@ -77,26 +77,26 @@ describe Settings::DeletesController do expect(response).to redirect_to settings_delete_path end end - end - context 'when not signed in' do - it 'redirects' do - delete :destroy - expect(response).to redirect_to '/auth/sign_in' - end - end + context 'when account deletions are disabled' do + around do |example| + open_deletion = Setting.open_deletion + example.run + Setting.open_deletion = open_deletion + end - context do - around do |example| - open_deletion = Setting.open_deletion - example.run - Setting.open_deletion = open_deletion + it 'redirects' do + Setting.open_deletion = false + delete :destroy + expect(response).to redirect_to root_path + end end + end + context 'when not signed in' do it 'redirects' do - Setting.open_deletion = false delete :destroy - expect(response).to redirect_to root_path + expect(response).to redirect_to '/auth/sign_in' end end end |