summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-29 15:21:50 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-29 15:21:50 +0800
commit5067d9d388589da39416d818358ec3e1211c6ed7 (patch)
tree5cf76cc411439380adc6a46f60b8c24043101d0d
parentb99263fbd120dcfea4159e800d8949fb6ad453e2 (diff)
downloadgitlab-ce-5067d9d388589da39416d818358ec3e1211c6ed7.tar.gz
Empty line between message =, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14664714
-rw-r--r--spec/models/project_services/slack_service/build_message_spec.rb9
-rw-r--r--spec/models/project_services/slack_service/pipeline_message_spec.rb3
2 files changed, 9 insertions, 3 deletions
diff --git a/spec/models/project_services/slack_service/build_message_spec.rb b/spec/models/project_services/slack_service/build_message_spec.rb
index 7fcfdf0eacd..a3ef121a093 100644
--- a/spec/models/project_services/slack_service/build_message_spec.rb
+++ b/spec/models/project_services/slack_service/build_message_spec.rb
@@ -24,9 +24,10 @@ describe SlackService::BuildMessage do
let(:status) { 'success' }
let(:color) { 'good' }
let(:duration) { 10 }
-
+
it 'returns a message with information about succeeded build' do
message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker passed in 10 seconds'
+
expect(subject.pretext).to be_empty
expect(subject.fallback).to eq(message)
expect(subject.attachments).to eq([text: message, color: color])
@@ -40,12 +41,13 @@ describe SlackService::BuildMessage do
it 'returns a message with information about failed build' do
message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 10 seconds'
+
expect(subject.pretext).to be_empty
expect(subject.fallback).to eq(message)
expect(subject.attachments).to eq([text: message, color: color])
end
- end
-
+ end
+
describe '#seconds_name' do
let(:status) { 'failed' }
let(:color) { 'danger' }
@@ -53,6 +55,7 @@ describe SlackService::BuildMessage do
it 'returns seconds as singular when there is only one' do
message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 1 second'
+
expect(subject.pretext).to be_empty
expect(subject.fallback).to eq(message)
expect(subject.attachments).to eq([text: message, color: color])
diff --git a/spec/models/project_services/slack_service/pipeline_message_spec.rb b/spec/models/project_services/slack_service/pipeline_message_spec.rb
index a292defee66..c27b7c82dd6 100644
--- a/spec/models/project_services/slack_service/pipeline_message_spec.rb
+++ b/spec/models/project_services/slack_service/pipeline_message_spec.rb
@@ -26,6 +26,7 @@ describe SlackService::PipelineMessage do
it 'returns a message with information about succeeded build' do
message = '<somewhere.com|project_name>: Pipeline <somewhere.com/pipelines/123|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker passed in 10 seconds'
+
expect(subject.pretext).to be_empty
expect(subject.fallback).to eq(message)
expect(subject.attachments).to eq([text: message, color: color])
@@ -39,6 +40,7 @@ describe SlackService::PipelineMessage do
it 'returns a message with information about failed build' do
message = '<somewhere.com|project_name>: Pipeline <somewhere.com/pipelines/123|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 10 seconds'
+
expect(subject.pretext).to be_empty
expect(subject.fallback).to eq(message)
expect(subject.attachments).to eq([text: message, color: color])
@@ -52,6 +54,7 @@ describe SlackService::PipelineMessage do
it 'returns seconds as singular when there is only one' do
message = '<somewhere.com|project_name>: Pipeline <somewhere.com/pipelines/123|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 1 second'
+
expect(subject.pretext).to be_empty
expect(subject.fallback).to eq(message)
expect(subject.attachments).to eq([text: message, color: color])