From 07bcabb305f62e445c77ca8081b473adf21f56da Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 28 Jul 2017 12:16:07 +0200
Subject: [PATCH] Improve wording related to deploy chatops command
---
doc/integration/slash_commands.md | 2 +-
lib/gitlab/slash_commands/presenters/deploy.rb | 2 +-
spec/lib/gitlab/slash_commands/command_spec.rb | 2 +-
spec/lib/gitlab/slash_commands/deploy_spec.rb | 6 +++---
spec/lib/gitlab/slash_commands/presenters/deploy_spec.rb | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/integration/slash_commands.md b/doc/integration/slash_commands.md
index 288ad1f7f5e..aa52b5415cf 100644
--- a/doc/integration/slash_commands.md
+++ b/doc/integration/slash_commands.md
@@ -24,7 +24,7 @@ It is possible to create new issue, display issue details and search up to 5 iss
## Deploy command
In order to deploy to an environment, GitLab will try to find a deployment
-action in the pipeline.
+manual action in the pipeline.
If there is only one action for a given environment, it is going to be triggered.
If there is more than one action defined, GitLab will try to find an action
diff --git a/lib/gitlab/slash_commands/presenters/deploy.rb b/lib/gitlab/slash_commands/presenters/deploy.rb
index b72586394bc..ebae0f57f9b 100644
--- a/lib/gitlab/slash_commands/presenters/deploy.rb
+++ b/lib/gitlab/slash_commands/presenters/deploy.rb
@@ -10,7 +10,7 @@ module Gitlab
end
def action_not_found
- ephemeral_response(text: "Couldn't find a deployment action.")
+ ephemeral_response(text: "Couldn't find a deployment manual action.")
end
end
end
diff --git a/spec/lib/gitlab/slash_commands/command_spec.rb b/spec/lib/gitlab/slash_commands/command_spec.rb
index f0ecf59406a..88f73bf90cd 100644
--- a/spec/lib/gitlab/slash_commands/command_spec.rb
+++ b/spec/lib/gitlab/slash_commands/command_spec.rb
@@ -80,7 +80,7 @@ describe Gitlab::SlashCommands::Command do
it 'returns error' do
expect(subject[:response_type]).to be(:ephemeral)
- expect(subject[:text]).to include('Too many actions defined')
+ expect(subject[:text]).to include("Couldn't find a deployment manual action.")
end
end
end
diff --git a/spec/lib/gitlab/slash_commands/deploy_spec.rb b/spec/lib/gitlab/slash_commands/deploy_spec.rb
index 17ebd088936..c3fb7d5adea 100644
--- a/spec/lib/gitlab/slash_commands/deploy_spec.rb
+++ b/spec/lib/gitlab/slash_commands/deploy_spec.rb
@@ -22,7 +22,7 @@ describe Gitlab::SlashCommands::Deploy do
context 'if no environment is defined' do
it 'does not execute an action' do
expect(subject[:response_type]).to be(:ephemeral)
- expect(subject[:text]).to eq "Couldn't find a deployment action."
+ expect(subject[:text]).to eq "Couldn't find a deployment manual action."
end
end
@@ -35,7 +35,7 @@ describe Gitlab::SlashCommands::Deploy do
context 'without actions' do
it 'does not execute an action' do
expect(subject[:response_type]).to be(:ephemeral)
- expect(subject[:text]).to eq "Couldn't find a deployment action."
+ expect(subject[:text]).to eq "Couldn't find a deployment manual action."
end
end
@@ -66,7 +66,7 @@ describe Gitlab::SlashCommands::Deploy do
end
it 'returns error about too many actions defined' do
- expect(subject[:text]).to eq("Couldn't find a deployment action.")
+ expect(subject[:text]).to eq("Couldn't find a deployment manual action.")
expect(subject[:response_type]).to be(:ephemeral)
end
end
diff --git a/spec/lib/gitlab/slash_commands/presenters/deploy_spec.rb b/spec/lib/gitlab/slash_commands/presenters/deploy_spec.rb
index eb94578c8e7..d16d122c64e 100644
--- a/spec/lib/gitlab/slash_commands/presenters/deploy_spec.rb
+++ b/spec/lib/gitlab/slash_commands/presenters/deploy_spec.rb
@@ -27,7 +27,7 @@ describe Gitlab::SlashCommands::Presenters::Deploy do
it 'tells the user there is no action' do
expect(subject[:response_type]).to be(:ephemeral)
- expect(subject[:text]).to eq "Couldn't find a deployment action."
+ expect(subject[:text]).to eq "Couldn't find a deployment manual action."
end
end
end
--
GitLab