diff options
author | David Yip <yipdw@member.fsf.org> | 2018-06-07 05:13:49 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-06-07 05:13:49 -0500 |
commit | 8142bd2553e7819722fdfc401e06cb10eeddd230 (patch) | |
tree | d771e65a58d3c69ba1c08c3fc145f24b5b806274 /spec/controllers/settings/sessions_controller_spec.rb | |
parent | f8d50a40701f344ea7c2a0e5475bbcbc727ef930 (diff) | |
parent | 2304d52599bfd3a907931971a94b9b68f229ab0a (diff) |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts: app/models/status.rb The conflict in the Status model was due to https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3. It was resolved by accepting tootsuite's changes.
Diffstat (limited to 'spec/controllers/settings/sessions_controller_spec.rb')
-rw-r--r-- | spec/controllers/settings/sessions_controller_spec.rb | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/spec/controllers/settings/sessions_controller_spec.rb b/spec/controllers/settings/sessions_controller_spec.rb new file mode 100644 index 000000000..52b204a6a --- /dev/null +++ b/spec/controllers/settings/sessions_controller_spec.rb @@ -0,0 +1,30 @@ +require 'rails_helper' + +describe Settings::SessionsController do + render_views + + let(:user) { Fabricate(:user) } + let(:session_activation) { Fabricate(:session_activation, user: user) } + before { sign_in user, scope: :user } + + describe 'DELETE #destroy' do + subject { delete :destroy, params: { id: id } } + + context 'when session activation exists' do + let(:id) { session_activation.id } + + it 'destroys session activation' do + is_expected.to redirect_to edit_user_registration_path + expect(SessionActivation.find_by(id: id)).to be_nil + end + end + + context 'when session activation does not exist' do + let(:id) { session_activation.id + 1000 } + + it 'destroys session activation' do + is_expected.to have_http_status :not_found + end + end + end +end |