1 files changed, 46 insertions, 9 deletions
diff --git a/spec/features/projects/settings/service_desk_setting_spec.rb b/spec/features/projects/settings/service_desk_setting_spec.rb
index 59e6f54da2f..d31913d2dcf 100644
--- a/spec/features/projects/settings/service_desk_setting_spec.rb
+++ b/spec/features/projects/settings/service_desk_setting_spec.rb
@@ -14,20 +14,57 @@ RSpec.describe 'Service Desk Setting', :js do
     allow_any_instance_of(Project).to receive(:present).with(current_user: user).and_return(presenter)
     allow(::Gitlab::IncomingEmail).to receive(:enabled?) { true }
     allow(::Gitlab::IncomingEmail).to receive(:supports_wildcard?) { true }
-
-    visit edit_project_path(project)
   end
 
   it 'shows activation checkbox' do
+    visit edit_project_path(project)
+
     expect(page).to have_selector("#service-desk-checkbox")
   end
 
-  it 'shows incoming email after activating' do
-    find("#service-desk-checkbox").click
-    wait_for_requests
-    project.reload
-    expect(project.service_desk_enabled).to be_truthy
-    expect(project.service_desk_address).to be_present
-    expect(find('[data-testid="incoming-email"]').value).to eq(project.service_desk_address)
+  context 'when service_desk_email is disabled' do
+    before do
+      allow(::Gitlab::ServiceDeskEmail).to receive(:enabled?).and_return(false)
+
+      visit edit_project_path(project)
+    end
+
+    it 'shows incoming email but not project name suffix after activating' do
+      find("#service-desk-checkbox").click
+
+      wait_for_requests
+
+      project.reload
+      expect(project.service_desk_enabled).to be_truthy
+      expect(project.service_desk_address).to be_present
+      expect(find('[data-testid="incoming-email"]').value).to eq(project.service_desk_incoming_address)
+      expect(page).not_to have_selector('#service-desk-project-suffix')
+    end
+  end
+
+  context 'when service_desk_email is enabled' do
+    before do
+      allow(::Gitlab::ServiceDeskEmail).to receive(:enabled?) { true }
+      allow(::Gitlab::ServiceDeskEmail).to receive(:address_for_key) { 'address-suffix@example.com' }
+
+      visit edit_project_path(project)
+    end
+
+    it 'allows setting of custom address suffix' do
+      find("#service-desk-checkbox").click
+      wait_for_requests
+
+      project.reload
+      expect(find('[data-testid="incoming-email"]').value).to eq(project.service_desk_incoming_address)
+
+      page.within '#js-service-desk' do
+        fill_in('service-desk-project-suffix', with: 'foo')
+        click_button 'Save changes'
+      end
+
+      wait_for_requests
+
+      expect(find('[data-testid="incoming-email"]').value).to eq('address-suffix@example.com')
+    end
   end
 end