Merge branch 'only-show-service-desk-email-to-members' into 'master'

Only show Service Desk email address to project members

See merge request gitlab-org/gitlab-ee!15676

ee/app/views/projects/issues/_service_desk_info_content.html.haml

@@ -16,7 +16,7 @@
     - else
       %h5= title_text
 
-    - if service_desk_enabled
+    - if can_edit_project_settings && service_desk_enabled
       %p
         = _("Have your users email")
         %code= @project.service_desk_address

ee/changelogs/unreleased/only-show-service-desk-email-to-members.yml

+---
+title: Only show Service Desk email address to project members
+merge_request: 15676
+author:
+type: changed

ee/spec/features/issues/service_desk_spec.rb

@@ -37,18 +37,14 @@ describe 'Service Desk Issue Tracker', :js do
             visit service_desk_project_issues_path(project_without_service_desk)
           end
 
-          it 'displays the large info box' do
+          it 'displays the large info box, documentation, and a button to configure' do
+            aggregate_failures do
               expect(page).to have_css('.empty-state')
-          end
-
-          it 'has a link to the documentation' do
               expect(page).to have_link('Read more', href: help_page_path('user/project/service_desk'))
-          end
-
-          it 'does show a button configure service desk' do
               expect(page).to have_link('Turn on Service Desk')
             end
           end
+        end
 
         context 'when user does not have permission to edit project settings' do
           before do
@@ -70,20 +66,32 @@ describe 'Service Desk Issue Tracker', :js do
             visit service_desk_project_issues_path(project)
           end
 
-          it 'displays the large info box' do
+          it 'displays the large info box, documentation, and the address' do
+            aggregate_failures do
               expect(page).to have_css('.empty-state')
+              expect(page).to have_link('Read more', href: help_page_path('user/project/service_desk'))
+              expect(page).not_to have_link('Turn on Service Desk')
+              expect(page).to have_content(project.service_desk_address)
+            end
           end
 
-          it 'has a link to the documentation' do
-            expect(page).to have_link('Read more', href: help_page_path('user/project/service_desk'))
+          context 'when user does not have permission to edit project settings' do
+            before do
+              user_2 = create(:user)
+
+              project.add_guest(user_2)
+              sign_in(user_2)
+              visit service_desk_project_issues_path(project)
             end
 
-          it 'does not show a button configure service desk' do
+            it 'displays the large info box and the documentation link' do
+              aggregate_failures do
+                expect(page).to have_css('.empty-state')
+                expect(page).to have_link('Read more', href: help_page_path('user/project/service_desk'))
                 expect(page).not_to have_link('Turn on Service Desk')
+                expect(page).not_to have_content(project.service_desk_address)
+              end
             end
-
-          it 'shows the service desk email address' do
-            expect(page).to have_content(project.service_desk_address)
           end
         end
       end
@@ -99,22 +107,15 @@ describe 'Service Desk Issue Tracker', :js do
             visit service_desk_project_issues_path(project)
           end
 
-          it 'displays the small info box' do
+          it 'displays the small info box, documentation, a button to configure service desk, and the address' do
+            aggregate_failures do
               expect(page).to have_css('.non-empty-state')
-          end
-
-          it 'has a link to the documentation' do
               expect(page).to have_link('Read more', href: help_page_path('user/project/service_desk'))
-          end
-
-          it 'does not show a button configure service desk' do
               expect(page).not_to have_link('Turn on Service Desk')
-          end
-
-          it 'shows the service desk email address' do
               expect(page).to have_content(project.service_desk_address)
             end
           end
+        end
 
         describe 'issues list' do
           before do