diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /spec/controllers/sent_notifications_controller_spec.rb | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'spec/controllers/sent_notifications_controller_spec.rb')
-rw-r--r-- | spec/controllers/sent_notifications_controller_spec.rb | 56 |
1 files changed, 47 insertions, 9 deletions
diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb index ec74a902258..e60cf37aad6 100644 --- a/spec/controllers/sent_notifications_controller_spec.rb +++ b/spec/controllers/sent_notifications_controller_spec.rb @@ -7,10 +7,12 @@ RSpec.describe SentNotificationsController do let(:project) { create(:project, :public) } let(:private_project) { create(:project, :private) } let(:sent_notification) { create(:sent_notification, project: target_project, noteable: noteable, recipient: user) } + let(:email) { 'email@example.com' } let(:issue) do - create(:issue, project: target_project) do |issue| + create(:issue, project: target_project, external_author: email) do |issue| issue.subscriptions.create!(user: user, project: target_project, subscribed: true) + issue.issue_email_participants.create!(email: email) end end @@ -29,6 +31,14 @@ RSpec.describe SentNotificationsController do let(:noteable) { issue } let(:target_project) { project } + def force_unsubscribe + get(:unsubscribe, params: { id: sent_notification.reply_key, force: true }) + end + + def unsubscribe + get(:unsubscribe, params: { id: sent_notification.reply_key }) + end + describe 'GET unsubscribe' do shared_examples 'returns 404' do it 'does not set the flash message' do @@ -43,13 +53,17 @@ RSpec.describe SentNotificationsController do context 'when the user is not logged in' do context 'when the force param is passed' do before do - get(:unsubscribe, params: { id: sent_notification.reply_key, force: true }) + force_unsubscribe end it 'unsubscribes the user' do expect(issue.subscribed?(user, project)).to be_falsey end + it 'does not delete the issue email participant for non-service-desk issue' do + expect { force_unsubscribe }.not_to change { issue.issue_email_participants.count } + end + it 'sets the flash message' do expect(controller).to set_flash[:notice].to(/unsubscribed/) end @@ -63,7 +77,7 @@ RSpec.describe SentNotificationsController do render_views before do - get(:unsubscribe, params: { id: sent_notification.reply_key }) + unsubscribe end shared_examples 'unsubscribing as anonymous' do |project_visibility| @@ -101,6 +115,10 @@ RSpec.describe SentNotificationsController do expect(response.body).to include(issue.title) end + it 'does not delete the issue email participant' do + expect { unsubscribe }.not_to change { issue.issue_email_participants.count } + end + it_behaves_like 'unsubscribing as anonymous', :public end @@ -171,7 +189,7 @@ RSpec.describe SentNotificationsController do before do sent_notification.noteable.destroy! - get(:unsubscribe, params: { id: sent_notification.reply_key }) + unsubscribe end it_behaves_like 'returns 404' @@ -193,7 +211,7 @@ RSpec.describe SentNotificationsController do context 'when the force param is passed' do before do - get(:unsubscribe, params: { id: sent_notification.reply_key, force: true }) + force_unsubscribe end it 'unsubscribes the user' do @@ -220,7 +238,7 @@ RSpec.describe SentNotificationsController do let(:sent_notification) { create(:sent_notification, project: project, noteable: merge_request, recipient: user) } before do - get(:unsubscribe, params: { id: sent_notification.reply_key }) + unsubscribe end it 'unsubscribes the user' do @@ -243,7 +261,7 @@ RSpec.describe SentNotificationsController do let(:target_project) { private_project } before do - get(:unsubscribe, params: { id: sent_notification.reply_key }) + unsubscribe end it 'unsubscribes user and redirects to root path' do @@ -257,12 +275,16 @@ RSpec.describe SentNotificationsController do before do private_project.add_developer(user) - get(:unsubscribe, params: { id: sent_notification.reply_key }) + unsubscribe end it 'unsubscribes user and redirects to issue path' do expect(response).to redirect_to(project_issue_path(private_project, issue)) end + + it 'does not delete the issue email participant for non-service-desk issue' do + expect { unsubscribe }.not_to change { issue.issue_email_participants.count } + end end end @@ -270,11 +292,27 @@ RSpec.describe SentNotificationsController do before do sent_notification.noteable.destroy! - get(:unsubscribe, params: { id: sent_notification.reply_key }) + unsubscribe end it_behaves_like 'returns 404' end + + context 'when support bot is the notification recipient' do + let(:sent_notification) { create(:sent_notification, project: target_project, noteable: noteable, recipient: User.support_bot) } + + it 'deletes the external author on the issue' do + expect { unsubscribe }.to change { issue.issue_email_participants.count }.by(-1) + end + + context 'when noteable is not an issue' do + let(:noteable) { merge_request } + + it 'does not delete the external author on the issue' do + expect { unsubscribe }.not_to change { issue.issue_email_participants.count } + end + end + end end end end |