Merge branch 'rs-deduplicate-notification-service-spec' into 'master'
De-duplicate two specs in spec/services/notification_service_spec See merge request !13168
This commit is contained in:
commit
f70cbb3a37
|
@ -694,17 +694,6 @@ describe NotificationService do
|
|||
let!(:subscriber_to_label_1) { create(:user) { |u| label_1.toggle_subscription(u, project) } }
|
||||
let!(:subscriber_to_label_2) { create(:user) { |u| label_2.toggle_subscription(u, project) } }
|
||||
|
||||
it "emails subscribers of the issue's added labels only" do
|
||||
notification.relabeled_issue(issue, [group_label_2, label_2], @u_disabled)
|
||||
|
||||
should_not_email(subscriber_to_label_1)
|
||||
should_not_email(subscriber_to_group_label_1)
|
||||
should_not_email(subscriber_to_group_label_2_on_another_project)
|
||||
should_email(subscriber_1_to_group_label_2)
|
||||
should_email(subscriber_2_to_group_label_2)
|
||||
should_email(subscriber_to_label_2)
|
||||
end
|
||||
|
||||
it "emails the current user if they've opted into notifications about their activity" do
|
||||
subscriber_to_label_2.notified_of_own_activity = true
|
||||
notification.relabeled_issue(issue, [group_label_2, label_2], subscriber_to_label_2)
|
||||
|
@ -721,6 +710,12 @@ describe NotificationService do
|
|||
it "doesn't send email to anyone but subscribers of the given labels" do
|
||||
notification.relabeled_issue(issue, [group_label_2, label_2], @u_disabled)
|
||||
|
||||
should_not_email(subscriber_to_label_1)
|
||||
should_not_email(subscriber_to_group_label_1)
|
||||
should_not_email(subscriber_to_group_label_2_on_another_project)
|
||||
should_email(subscriber_1_to_group_label_2)
|
||||
should_email(subscriber_2_to_group_label_2)
|
||||
should_email(subscriber_to_label_2)
|
||||
should_not_email(issue.assignees.first)
|
||||
should_not_email(issue.author)
|
||||
should_not_email(@u_watcher)
|
||||
|
@ -730,12 +725,6 @@ describe NotificationService do
|
|||
should_not_email(@watcher_and_subscriber)
|
||||
should_not_email(@unsubscriber)
|
||||
should_not_email(@u_participating)
|
||||
should_not_email(subscriber_to_label_1)
|
||||
should_not_email(subscriber_to_group_label_1)
|
||||
should_not_email(subscriber_to_group_label_2_on_another_project)
|
||||
should_email(subscriber_1_to_group_label_2)
|
||||
should_email(subscriber_2_to_group_label_2)
|
||||
should_email(subscriber_to_label_2)
|
||||
end
|
||||
|
||||
context 'confidential issues' do
|
||||
|
@ -878,11 +867,6 @@ describe NotificationService do
|
|||
end
|
||||
|
||||
describe '#new_merge_request' do
|
||||
before do
|
||||
update_custom_notification(:new_merge_request, @u_guest_custom, resource: project)
|
||||
update_custom_notification(:new_merge_request, @u_custom_global)
|
||||
end
|
||||
|
||||
it do
|
||||
notification.new_merge_request(merge_request, @u_disabled)
|
||||
|
||||
|
@ -1008,7 +992,7 @@ describe NotificationService do
|
|||
let!(:subscriber_to_label_1) { create(:user) { |u| label_1.toggle_subscription(u, project) } }
|
||||
let!(:subscriber_to_label_2) { create(:user) { |u| label_2.toggle_subscription(u, project) } }
|
||||
|
||||
it "emails subscribers of the merge request's added labels only" do
|
||||
it "doesn't send email to anyone but subscribers of the given labels" do
|
||||
notification.relabeled_merge_request(merge_request, [group_label_2, label_2], @u_disabled)
|
||||
|
||||
should_not_email(subscriber_to_label_1)
|
||||
|
@ -1017,11 +1001,6 @@ describe NotificationService do
|
|||
should_email(subscriber_1_to_group_label_2)
|
||||
should_email(subscriber_2_to_group_label_2)
|
||||
should_email(subscriber_to_label_2)
|
||||
end
|
||||
|
||||
it "doesn't send email to anyone but subscribers of the given labels" do
|
||||
notification.relabeled_merge_request(merge_request, [group_label_2, label_2], @u_disabled)
|
||||
|
||||
should_not_email(merge_request.assignee)
|
||||
should_not_email(merge_request.author)
|
||||
should_not_email(@u_watcher)
|
||||
|
@ -1031,12 +1010,6 @@ describe NotificationService do
|
|||
should_not_email(@unsubscriber)
|
||||
should_not_email(@u_participating)
|
||||
should_not_email(@u_lazy_participant)
|
||||
should_not_email(subscriber_to_label_1)
|
||||
should_not_email(subscriber_to_group_label_1)
|
||||
should_not_email(subscriber_to_group_label_2_on_another_project)
|
||||
should_email(subscriber_1_to_group_label_2)
|
||||
should_email(subscriber_2_to_group_label_2)
|
||||
should_email(subscriber_to_label_2)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1081,12 +1054,12 @@ describe NotificationService do
|
|||
|
||||
should_email(merge_request.assignee)
|
||||
should_email(@u_watcher)
|
||||
should_email(@u_guest_watcher)
|
||||
should_email(@u_guest_custom)
|
||||
should_email(@u_custom_global)
|
||||
should_email(@u_participant_mentioned)
|
||||
should_email(@subscriber)
|
||||
should_email(@watcher_and_subscriber)
|
||||
should_email(@u_guest_watcher)
|
||||
should_email(@u_custom_global)
|
||||
should_email(@u_guest_custom)
|
||||
should_not_email(@unsubscriber)
|
||||
should_not_email(@u_participating)
|
||||
should_not_email(@u_disabled)
|
||||
|
|
Loading…
Reference in New Issue