Re-use notifications dropdown/modal for user profile

5 files changed, 225 insertions, 122 deletions

diff --git a/spec/controllers/groups/notification_settings_controller_spec.rb b/spec/controllers/groups/notification_settings_controller_spec.rb
deleted file mode 100644
index 0786e45515a..00000000000
--- a/spec/controllers/groups/notification_settings_controller_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe Groups::NotificationSettingsController do
-  let(:group) { create(:group) }
-  let(:user) { create(:user) }
-
-  describe '#update' do
-    context 'when not authorized' do
-      it 'redirects to sign in page' do
-        put :update,
-            group_id: group.to_param,
-            notification_setting: { level: :participating }
-
-        expect(response).to redirect_to(new_user_session_path)
-      end
-    end
-
-    context 'when authorized' do
-      before do
-        sign_in(user)
-      end
-
-      it 'returns success' do
-        put :update,
-            group_id: group.to_param,
-            notification_setting: { level: :participating }
-
-        expect(response.status).to eq 200
-      end
-    end
-  end
-end
diff --git a/spec/controllers/notification_settings_controller_spec.rb b/spec/controllers/notification_settings_controller_spec.rb
new file mode 100644
index 00000000000..15d155833b4
--- /dev/null
+++ b/spec/controllers/notification_settings_controller_spec.rb
@@ -0,0 +1,125 @@
+require 'spec_helper'
+
+describe NotificationSettingsController do
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.team << [user, :developer]
+  end
+
+  describe '#create' do
+    context 'when not authorized' do
+      it 'redirects to sign in page' do
+        post :create,
+             project: { id: project.id },
+             notification_setting: { level: :participating }
+
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+
+    context 'when authorized' do
+      before do
+        sign_in(user)
+      end
+
+      it 'returns success' do
+        post :create,
+             project: { id: project.id },
+             notification_setting: { level: :participating }
+
+        expect(response.status).to eq 200
+      end
+
+      context 'and setting custom notification setting' do
+        let(:custom_events) do
+          events = {}
+
+          NotificationSetting::EMAIL_EVENTS.each do |event|
+            events[event] = "true"
+          end
+        end
+
+        it 'returns success' do
+          post :create,
+               project: { id: project.id },
+               notification_setting: { level: :participating, events: custom_events }
+
+          expect(response.status).to eq 200
+        end
+      end
+    end
+
+    context 'not authorized' do
+      let(:private_project) { create(:project, :private) }
+      before { sign_in(user) }
+
+      it 'returns 404' do
+        post :create,
+             project: { id: private_project.id },
+             notification_setting: { level: :participating }
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
+  describe '#update' do
+    let(:notification_setting) { user.global_notification_setting }
+
+    context 'when not authorized' do
+      it 'redirects to sign in page' do
+        put :update,
+            id: notification_setting,
+            notification_setting: { level: :participating }
+
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+
+    context 'when authorized' do
+      before{ sign_in(user) }
+
+      it 'returns success' do
+        put :update,
+            id: notification_setting,
+            notification_setting: { level: :participating }
+
+        expect(response.status).to eq 200
+      end
+
+      context 'and setting custom notification setting' do
+        let(:custom_events) do
+          events = {}
+
+          NotificationSetting::EMAIL_EVENTS.each do |event|
+            events[event] = "true"
+          end
+        end
+
+        it 'returns success' do
+          put :update,
+              id: notification_setting,
+              notification_setting: { level: :participating, events: custom_events }
+
+          expect(response.status).to eq 200
+        end
+      end
+    end
+
+    context 'not authorized' do
+      let(:other_user) { create(:user) }
+
+      before { sign_in(other_user) }
+
+      it 'returns 404' do
+        put :update,
+            id: notification_setting,
+            notification_setting: { level: :participating }
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/notification_settings_controller_spec.rb b/spec/controllers/projects/notification_settings_controller_spec.rb
deleted file mode 100644
index a726f70a64a..00000000000
--- a/spec/controllers/projects/notification_settings_controller_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper'
-
-describe Projects::NotificationSettingsController do
-  let(:project) { create(:empty_project) }
-  let(:user) { create(:user) }
-
-  before do
-    project.team << [user, :developer]
-  end
-
-  describe '#update' do
-    context 'when not authorized' do
-      it 'redirects to sign in page' do
-        put :update,
-            namespace_id: project.namespace.to_param,
-            project_id: project.to_param,
-            notification_setting: { level: :participating }
-
-        expect(response).to redirect_to(new_user_session_path)
-      end
-    end
-
-    context 'when authorized' do
-      before do
-        sign_in(user)
-      end
-
-      it 'returns success' do
-        put :update,
-            namespace_id: project.namespace.to_param,
-            project_id: project.to_param,
-            notification_setting: { level: :participating }
-
-        expect(response.status).to eq 200
-      end
-
-      context 'and setting custom notification setting' do
-        let(:custom_events) do
-          events = {}
-
-          NotificationSetting::EMAIL_EVENTS.each do |event|
-            events[event] = "true"
-          end
-        end
-
-        it 'returns success' do
-          put :update,
-              namespace_id: project.namespace.to_param,
-              project_id: project.to_param,
-              notification_setting: { level: :participating, events: custom_events }
-
-          expect(response.status).to eq 200
-        end
-      end
-    end
-
-    context 'not authorized' do
-      let(:private_project) { create(:project, :private) }
-      before { sign_in(user) }
-
-      it 'returns 404' do
-        put :update,
-            namespace_id: private_project.namespace.to_param,
-            project_id: private_project.to_param,
-            notification_setting: { level: :participating }
-
-        expect(response.status).to eq(404)
-      end
-    end
-  end
-end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index f167813e07d..2a2ac8710ee 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -428,8 +428,9 @@ describe API::API, api: true  do
 
     describe 'permissions' do
       context 'all projects' do
-        it 'Contains permission information' do
-          project.team << [user, :master]
+        before { project.team << [user, :master] }
+
+        it 'contains permission information' do
           get api("/projects", user)
 
           expect(response.status).to eq(200)
@@ -437,10 +438,18 @@ describe API::API, api: true  do
               to eq(Gitlab::Access::MASTER)
           expect(json_response.first['permissions']['group_access']).to be_nil
         end
+
+        it 'contains notification level information' do
+          get api("/projects", user)
+
+          expect(response.status).to eq(200)
+          expect(json_response.first['permissions']['project_access']['notification_level']['level']).to eq(NotificationSetting.levels[:global])
+          expect(json_response.first['permissions']['project_access']['notification_level'].keys).to include('events')
+        end
       end
 
       context 'personal project' do
-        it 'Sets project access and returns 200' do
+        it 'sets project access and returns 200' do
           project.team << [user, :master]
           get api("/projects/#{project.id}", user)
 
@@ -452,9 +461,11 @@ describe API::API, api: true  do
       end
 
       context 'group project' do
+        let(:project2) { create(:project, group: create(:group)) }
+
+        before { project2.group.add_owner(user) }
+
         it 'should set the owner and return 200' do
-          project2 = create(:project, group: create(:group))
-          project2.group.add_owner(user)
           get api("/projects/#{project2.id}", user)
 
           expect(response.status).to eq(200)
@@ -462,6 +473,14 @@ describe API::API, api: true  do
           expect(json_response['permissions']['group_access']['access_level']).
             to eq(Gitlab::Access::OWNER)
         end
+
+        it 'shows notification level information' do
+          get api("/projects/#{project2.id}", user)
+
+          expect(response.status).to eq(200)
+          expect(json_response['permissions']['group_access']['notification_level']['level']).to eq(NotificationSetting.levels[:global])
+          expect(json_response['permissions']['group_access']['notification_level'].keys).to include('events')
+        end
       end
     end
   end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 616d0cd00f7..c4edb8c3fd0 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -46,7 +46,8 @@ describe NotificationService, services: true do
         project.team << [issue.assignee, :master]
         project.team << [note.author, :master]
         create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@subscribed_participant cc this guy')
-        update_custom_notification(:new_note)
+        update_custom_notification(:new_note, @u_guest_custom, project)
+        update_custom_notification(:new_note, @u_custom_global)
       end
 
       describe :new_note do
@@ -54,7 +55,7 @@ describe NotificationService, services: true do
           add_users_with_subscription(note.project, issue)
 
           # Ensure create SentNotification by noteable = issue 6 times, not noteable = note
-          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(7).times
+          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(8).times
 
           ActionMailer::Base.deliveries.clear
 
@@ -63,6 +64,7 @@ describe NotificationService, services: true do
           should_email(@u_watcher)
           should_email(note.noteable.author)
           should_email(note.noteable.assignee)
+          should_email(@u_custom_global)
           should_email(@u_mentioned)
           should_email(@subscriber)
           should_email(@watcher_and_subscriber)
@@ -105,10 +107,12 @@ describe NotificationService, services: true do
         before do
           note.project.namespace_id = group.id
           note.project.group.add_user(@u_watcher, GroupMember::MASTER)
+          note.project.group.add_user(@u_custom_global, GroupMember::MASTER)
           note.project.save
 
           @u_watcher.notification_settings_for(note.project).participating!
           @u_watcher.notification_settings_for(note.project.group).global!
+          update_custom_notification(:new_note, @u_custom_global)
           ActionMailer::Base.deliveries.clear
         end
 
@@ -118,6 +122,7 @@ describe NotificationService, services: true do
           should_email(note.noteable.author)
           should_email(note.noteable.assignee)
           should_email(@u_mentioned)
+          should_email(@u_custom_global)
           should_not_email(@u_guest_custom)
           should_not_email(@u_guest_watcher)
           should_not_email(@u_watcher)
@@ -139,6 +144,10 @@ describe NotificationService, services: true do
       let(:admin) { create(:admin) }
       let(:confidential_issue) { create(:issue, :confidential, project: project, author: author, assignee: assignee) }
       let(:note) { create(:note_on_issue, noteable: confidential_issue, project: project, note: "#{author.to_reference} #{assignee.to_reference} #{non_member.to_reference} #{member.to_reference} #{admin.to_reference}") }
+      let(:guest_watcher) { create_user_with_notification(:watch, "guest-watcher-confidential") }
+
+      before do
+      end
 
       it 'filters out users that can not read the issue' do
         project.team << [member, :developer]
@@ -152,6 +161,7 @@ describe NotificationService, services: true do
 
         should_not_email(non_member)
         should_not_email(guest)
+        should_not_email(guest_watcher)
         should_email(author)
         should_email(assignee)
         should_email(member)
@@ -226,6 +236,9 @@ describe NotificationService, services: true do
             should_email(member)
           end
 
+          # it emails custom global users on mention
+          should_email(@u_custom_global)
+
           should_email(@u_guest_watcher)
           should_email(note.noteable.author)
           should_not_email(note.author)
@@ -244,13 +257,15 @@ describe NotificationService, services: true do
         build_team(note.project)
         ActionMailer::Base.deliveries.clear
         allow_any_instance_of(Commit).to receive(:author).and_return(@u_committer)
-        update_custom_notification(:new_note)
+        update_custom_notification(:new_note, @u_guest_custom, project)
+        update_custom_notification(:new_note, @u_custom_global)
       end
 
       describe '#new_note, #perform_enqueued_jobs' do
         it do
           notification.new_note(note)
           should_email(@u_guest_watcher)
+          should_email(@u_custom_global)
           should_email(@u_guest_custom)
           should_email(@u_committer)
           should_email(@u_watcher)
@@ -292,7 +307,8 @@ describe NotificationService, services: true do
       build_team(issue.project)
       add_users_with_subscription(issue.project, issue)
       ActionMailer::Base.deliveries.clear
-      update_custom_notification(:new_issue)
+      update_custom_notification(:new_issue, @u_guest_custom, project)
+      update_custom_notification(:new_issue, @u_custom_global)
     end
 
     describe '#new_issue' do
@@ -303,6 +319,7 @@ describe NotificationService, services: true do
         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_not_email(@u_mentioned)
         should_not_email(@u_participating)
@@ -351,6 +368,7 @@ describe NotificationService, services: true do
 
           notification.new_issue(confidential_issue, @u_disabled)
 
+          should_not_email(@u_guest_watcher)
           should_not_email(non_member)
           should_not_email(author)
           should_not_email(guest)
@@ -362,7 +380,11 @@ describe NotificationService, services: true do
     end
 
     describe '#reassigned_issue' do
-      before { update_custom_notification(:reassign_issue) }
+
+      before do
+        update_custom_notification(:reassign_issue, @u_guest_custom, project)
+        update_custom_notification(:reassign_issue, @u_custom_global)
+      end
 
       it 'emails new assignee' do
         notification.reassigned_issue(issue, @u_disabled)
@@ -371,6 +393,7 @@ describe NotificationService, services: true do
         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_not_email(@unsubscriber)
@@ -390,6 +413,7 @@ describe NotificationService, services: true do
         should_email(@u_guest_custom)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@u_custom_global)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -407,6 +431,7 @@ describe NotificationService, services: true do
         should_email(@u_guest_custom)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@u_custom_global)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -424,6 +449,7 @@ describe NotificationService, services: true do
         should_email(@u_guest_custom)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@u_custom_global)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -440,6 +466,7 @@ describe NotificationService, services: true do
         should_email(@u_guest_custom)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
+        should_email(@u_custom_global)
         should_not_email(issue.assignee)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
@@ -542,7 +569,11 @@ describe NotificationService, services: true do
     end
 
     describe '#close_issue' do
-      before { update_custom_notification(:close_issue) }
+
+      before do
+        update_custom_notification(:close_issue, @u_guest_custom, project)
+        update_custom_notification(:close_issue, @u_custom_global)
+      end
 
       it 'should sent email to issue assignee and issue author' do
         notification.close_issue(issue, @u_disabled)
@@ -552,6 +583,7 @@ describe NotificationService, services: true do
         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)
@@ -591,7 +623,10 @@ describe NotificationService, services: true do
     end
 
     describe '#reopen_issue' do
-      before { update_custom_notification(:reopen_issue) }
+      before do
+        update_custom_notification(:reopen_issue, @u_guest_custom, project)
+        update_custom_notification(:reopen_issue, @u_custom_global)
+      end
 
       it 'should send email to issue assignee and issue author' do
         notification.reopen_issue(issue, @u_disabled)
@@ -601,6 +636,7 @@ describe NotificationService, services: true do
         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)
@@ -650,7 +686,10 @@ describe NotificationService, services: true do
     end
 
     describe '#new_merge_request' do
-      before { update_custom_notification(:new_merge_request) }
+      before do
+        update_custom_notification(:new_merge_request, @u_guest_custom, project)
+        update_custom_notification(:new_merge_request, @u_custom_global)
+      end
 
       it do
         notification.new_merge_request(merge_request, @u_disabled)
@@ -661,6 +700,7 @@ describe NotificationService, services: true do
         should_email(@u_participant_mentioned)
         should_email(@u_guest_watcher)
         should_email(@u_guest_custom)
+        should_email(@u_custom_global)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
         should_not_email(@u_lazy_participant)
@@ -707,7 +747,10 @@ describe NotificationService, services: true do
     end
 
     describe '#reassigned_merge_request' do
-      before { update_custom_notification(:reassign_merge_request) }
+      before do
+        update_custom_notification(:reassign_merge_request, @u_guest_custom, project)
+        update_custom_notification(:reassign_merge_request, @u_custom_global)
+      end
 
       it do
         notification.reassigned_merge_request(merge_request, merge_request.author)
@@ -719,6 +762,7 @@ describe NotificationService, services: true do
         should_email(@watcher_and_subscriber)
         should_email(@u_guest_watcher)
         should_email(@u_guest_custom)
+        should_email(@u_custom_global)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -786,7 +830,10 @@ describe NotificationService, services: true do
     end
 
     describe '#closed_merge_request' do
-      before { update_custom_notification(:close_merge_request) }
+      before do
+        update_custom_notification(:close_merge_request, @u_guest_custom, project)
+        update_custom_notification(:close_merge_request, @u_custom_global)
+      end
 
       it do
         notification.close_mr(merge_request, @u_disabled)
@@ -795,6 +842,7 @@ describe NotificationService, services: true do
         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)
@@ -835,7 +883,11 @@ describe NotificationService, services: true do
     end
 
     describe '#merged_merge_request' do
-      before { update_custom_notification(:merge_merge_request) }
+
+      before do
+        update_custom_notification(:merge_merge_request, @u_guest_custom, project)
+        update_custom_notification(:merge_merge_request, @u_custom_global)
+      end
 
       it do
         notification.merge_mr(merge_request, @u_disabled)
@@ -846,6 +898,7 @@ describe NotificationService, services: true do
         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)
@@ -884,7 +937,10 @@ describe NotificationService, services: true do
     end
 
     describe '#reopen_merge_request' do
-      before { update_custom_notification(:reopen_merge_request) }
+      before do
+        update_custom_notification(:reopen_merge_request, @u_guest_custom, project)
+        update_custom_notification(:reopen_merge_request, @u_custom_global)
+      end
 
       it do
         notification.reopen_mr(merge_request, @u_disabled)
@@ -896,6 +952,7 @@ describe NotificationService, services: true do
         should_email(@watcher_and_subscriber)
         should_email(@u_guest_watcher)
         should_email(@u_guest_custom)
+        should_email(@u_custom_global)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -948,6 +1005,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@u_participating)
         should_email(@u_lazy_participant)
+        should_email(@u_custom_global)
         should_not_email(@u_guest_watcher)
         should_not_email(@u_guest_custom)
         should_not_email(@u_disabled)
@@ -964,6 +1022,7 @@ describe NotificationService, services: true do
     @u_committer             = create(:user, username: 'committer')
     @u_not_mentioned         = create_global_setting_for(create(:user, username: 'regular'), :participating)
     @u_outsider_mentioned    = create(:user, username: 'outsider')
+    @u_custom_global         = create_global_setting_for(create(:user, username: 'custom_global'), :custom)
 
     # User to be participant by default
     # This user does not contain any record in notification settings table
@@ -981,6 +1040,7 @@ describe NotificationService, services: true do
     project.team << [@u_committer, :master]
     project.team << [@u_not_mentioned, :master]
     project.team << [@u_lazy_participant, :master]
+    project.team << [@u_custom_global, :master]
   end
 
   def create_global_setting_for(user, level)
@@ -1000,8 +1060,10 @@ describe NotificationService, services: true do
     user
   end
 
-  def update_custom_notification(event)
-    setting = @u_guest_custom.notification_settings_for(project)
+  # Create custom notifications
+  # When resource is nil it means global notification
+  def update_custom_notification(event, user, resource = nil)
+    setting = user.notification_settings_for(resource)
     setting.events[event] = true
     setting.save
   end