Improve after feedback

4 files changed, 16 insertions, 14 deletions

diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb
index dee43d69895..70e203efcf5 100644
--- a/spec/features/projects/services/slack_slash_command_spec.rb
+++ b/spec/features/projects/services/slack_slash_command_spec.rb
@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-feature 'Setup Slack slash commands', feature: true do
+feature 'Slack slash commands', feature: true do
   include WaitForAjax
 
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
-  let(:service) { project.create_slack_slash_commands_service }
+  given(:user) { create(:user) }
+  given(:project) { create(:project) }
+  given(:service) { project.create_slack_slash_commands_service }
 
-  before do
+  background do
     project.team << [user, :master]
     login_as(user)
   end
 
-  describe 'user visits the slack slash command config page', js: true do
+  scenario 'user visits the slack slash command config page', js: true do
     it 'shows a help message' do
       visit edit_namespace_project_service_path(project.namespace, project, service)
 
@@ -22,8 +22,8 @@ feature 'Setup Slack slash commands', feature: true do
     end
   end
 
-  describe 'saving a token' do
-    let(:token) { ('a'..'z').to_a.join }
+  scenario 'saving a token' do
+    given(:token) { ('a'..'z').to_a.join }
 
     it 'shows the token after saving' do
       visit edit_namespace_project_service_path(project.namespace, project, service)
@@ -37,7 +37,7 @@ feature 'Setup Slack slash commands', feature: true do
     end
   end
 
-  describe 'the trigger url' do
+  scenario 'the trigger url' do
     it 'shows the correct url' do
       visit edit_namespace_project_service_path(project.namespace, project, service)
 
diff --git a/spec/models/project_services/mattermost_slash_commands_service_spec.rb b/spec/models/project_services/mattermost_slash_commands_service_spec.rb
index 5c34cb6b4cf..1ae1483e2a4 100644
--- a/spec/models/project_services/mattermost_slash_commands_service_spec.rb
+++ b/spec/models/project_services/mattermost_slash_commands_service_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe MattermostSlashCommandsService, models: true do
-  it_behaves_like "chat slash commands"
+describe MattermostSlashCommandsService, :models do
+  it_behaves_like "chat slash commands service"
 end
diff --git a/spec/models/project_services/slack_slash_commands_service.rb b/spec/models/project_services/slack_slash_commands_service.rb
index c3fa80caebe..5775e439906 100644
--- a/spec/models/project_services/slack_slash_commands_service.rb
+++ b/spec/models/project_services/slack_slash_commands_service.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe SlackSlashCommandsService, models: true do
-  it_behaves_like "chat slash commands"
+describe SlackSlashCommandsService, :models do
+  it_behaves_like "chat slash commands service"
 
   describe '#trigger' do
     context 'when an auth url is generated' do
@@ -15,11 +15,13 @@ describe SlackSlashCommandsService, models: true do
           token: 'token'
         }
       end
+
       let(:service) do
         project.create_slack_slash_commands_service(
           properties: { token: 'token' }
         )
       end
+
       let(:authorize_url) do
         'http://authorize.example.com/'
       end
diff --git a/spec/support/chat_slash_commands_shared_examples.rb b/spec/support/chat_slash_commands_shared_examples.rb
index 96130b45235..4dfa29849ee 100644
--- a/spec/support/chat_slash_commands_shared_examples.rb
+++ b/spec/support/chat_slash_commands_shared_examples.rb
@@ -1,4 +1,4 @@
-RSpec.shared_examples 'chat slash commands' do
+RSpec.shared_examples 'chat slash commands service' do
   describe "Associations" do
     it { is_expected.to respond_to :token }
     it { is_expected.to have_many :chat_names }