summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spec/services/notification_service_spec.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 845aa87d3ff..4b40c86574f 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -644,18 +644,14 @@ describe NotificationService, :mailer do
end
describe 'Participating project notification settings have priority over group and global settings if available' do
- let(:group) { create(:group) }
+ let!(:group) { create(:group) }
+ let!(:maintainer) { group.add_owner(create(:user, username: 'maintainer')).user }
+ let!(:user1) { group.add_developer(create(:user, username: 'user_with_project_and_custom_setting')).user }
+
let(:project) { create(:project, :public, namespace: group) }
- let(:another_project) { create(:project, :public, namespace: group) }
let(:issue) { create :issue, project: project, assignees: [assignee], description: '' }
- let(:maintainer) { create(:user, username: 'maintainer') }
- let(:user1) { create(:user, username: 'user_with_project_and_custom_setting') }
-
before do
- project.add_maintainer(maintainer)
- project.save!
-
reset_delivered_emails!
create_notification_setting(user1, project, :participating)