1 files changed, 53 insertions, 47 deletions

diff --git a/spec/features/issues/service_desk_spec.rb b/spec/features/issues/service_desk_spec.rb
index 2912ac33625..1512d539dec 100644
--- a/spec/features/issues/service_desk_spec.rb
+++ b/spec/features/issues/service_desk_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe 'Service Desk Issue Tracker', :js do
   let(:user) { create(:user) }
 
   before do
+    # The following two conditions equate to Gitlab::ServiceDesk.supported == true
     allow(Gitlab::IncomingEmail).to receive(:enabled?).and_return(true)
     allow(Gitlab::IncomingEmail).to receive(:supports_wildcard?).and_return(true)
 
@@ -27,53 +28,7 @@ RSpec.describe 'Service Desk Issue Tracker', :js do
   end
 
   describe 'issues list' do
-    context 'when service desk is misconfigured' do
-      before do
-        allow(Gitlab::ServiceDesk).to receive(:supported?).and_return(false)
-        visit service_desk_project_issues_path(project)
-      end
-
-      it 'shows a message to say the configuration is incomplete' do
-        expect(page).to have_css('.empty-state')
-        expect(page).to have_text('Service Desk is enabled but not yet active')
-        expect(page).to have_text('You must set up incoming email before it becomes active')
-        expect(page).to have_link('More information', href: help_page_path('administration/incoming_email', anchor: 'set-it-up'))
-      end
-    end
-
-    context 'when service desk has not been activated' do
-      let(:project_without_service_desk) { create(:project, :private, service_desk_enabled: false) }
-
-      describe 'service desk info content' do
-        context 'when user has permissions to edit project settings' do
-          before do
-            project_without_service_desk.add_maintainer(user)
-            visit service_desk_project_issues_path(project_without_service_desk)
-          end
-
-          it 'displays the large info box, documentation, and a button to configure' 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).to have_link('Turn on Service Desk')
-            end
-          end
-        end
-
-        context 'when user does not have permission to edit project settings' do
-          before do
-            project_without_service_desk.add_guest(user)
-            visit service_desk_project_issues_path(project_without_service_desk)
-          end
-
-          it 'does not show a button configure service desk' do
-            expect(page).not_to have_link('Turn on Service Desk')
-          end
-        end
-      end
-    end
-
-    context 'when service desk has been activated' do
+    context 'when service desk is supported' do
       context 'when there are no issues' do
         describe 'service desk info content' do
           it 'displays the large info box, documentation, and the address' do
@@ -81,6 +36,7 @@ RSpec.describe 'Service Desk Issue Tracker', :js do
 
             aggregate_failures do
               expect(page).to have_css('.empty-state')
+              expect(page).to have_text('Use Service Desk to connect with your users')
               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)
@@ -99,6 +55,7 @@ RSpec.describe 'Service Desk Issue Tracker', :js 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_text('Use Service Desk to connect with your users')
                 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)
@@ -152,6 +109,55 @@ RSpec.describe 'Service Desk Issue Tracker', :js do
             find('.input-token .filtered-search').native.send_key(:backspace)
             expect(page).to have_selector('.js-visual-token', count: 1)
           end
+
+          it 'support bot author token has been properly added' do
+            within('.filtered-search-token') do
+              expect(page).to have_selector('.name', count: 1, visible: false)
+              expect(page).to have_selector('.operator', count: 1, visible: false)
+              expect(page).to have_selector('.value-container', count: 1, visible: false)
+            end
+          end
+        end
+      end
+    end
+
+    context 'when service desk is not supported' do
+      let(:project_without_service_desk) { create(:project, :private, service_desk_enabled: false) }
+
+      before do
+        allow(Gitlab::ServiceDesk).to receive(:supported?).and_return(false)
+        visit service_desk_project_issues_path(project)
+      end
+
+      describe 'service desk info content' do
+        context 'when user has permissions to edit project settings' do
+          before do
+            project_without_service_desk.add_maintainer(user)
+            visit service_desk_project_issues_path(project_without_service_desk)
+          end
+
+          it 'informs user to setup incoming email to turn on support for Service Desk' do
+            aggregate_failures do
+              expect(page).to have_css('.empty-state')
+              expect(page).to have_text('Service Desk is not supported')
+              expect(page).to have_text('In order to enable Service Desk for your instance, you must first set up incoming email.')
+              expect(page).to have_link('More information', href: help_page_path('administration/incoming_email', anchor: 'set-it-up'))
+            end
+          end
+        end
+
+        context 'when user does not have permission to edit project settings' do
+          before do
+            project_without_service_desk.add_developer(user)
+            visit service_desk_project_issues_path(project_without_service_desk)
+          end
+
+          it 'informs user to contact an administrator to enable service desk' do
+            expect(page).to have_css('.empty-state')
+            # NOTE: here, "enabled" is not used in the sense of "ServiceDesk::Enabled?"
+            expect(page).to have_text('Service Desk is not enabled')
+            expect(page).to have_text('For help setting up the Service Desk for your instance, please contact an administrator.')
+          end
         end
       end
     end