1 files changed, 19 insertions, 15 deletions
diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index f474e7e891b..274d50e7ce4 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -4,29 +4,26 @@ feature 'Setup Mattermost slash commands', feature: true do
   include WaitForAjax
 
   let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
   let(:service) { project.create_mattermost_slash_commands_service }
+  let(:mattermost_enabled) { true }
 
   before do
+    Settings.mattermost['enabled'] = mattermost_enabled
     project.team << [user, :master]
     login_as(user)
+    visit edit_namespace_project_service_path(project.namespace, project, service)
   end
 
-  describe 'user visites the mattermost slash command config page', js: true do
+  describe 'user visits the mattermost slash command config page', js: true do
     it 'shows a help message' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
-
       wait_for_ajax
 
       expect(page).to have_content("This service allows GitLab users to perform common")
     end
-  end
-
-  describe 'saving a token' do
-    let(:token) { ('a'..'z').to_a.join }
 
     it 'shows the token after saving' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+      token = ('a'..'z').to_a.join
 
       fill_in 'service_token', with: token
       click_on 'Save'
@@ -35,14 +32,21 @@ feature 'Setup Mattermost slash commands', feature: true do
 
       expect(value).to eq(token)
     end
-  end
 
-  describe 'the trigger url' do
-    it 'shows the correct url' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+    describe 'mattermost service is enabled' do
+      it 'shows the add to mattermost button' do
+        expect(page).to have_link 'Add to Mattermost'
+      end
+    end
+
+    describe 'mattermost service is not enabled' do
+      let(:mattermost_enabled) { false }
+
+      it 'shows the correct trigger url' do
+        value = find_field('request_url').value
 
-      value = find_field('request_url').value
-      expect(value).to match("api/v3/projects/#{project.id}/services/mattermost_slash_commands/trigger")
+        expect(value).to match("api/v3/projects/#{project.id}/services/mattermost_slash_commands/trigger")
+      end
     end
   end
 end