diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 14:00:28 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 14:00:28 +0300 |
| commit | 7ef7135adf449644beb7ca037b8b8a8132e4c776 (patch) | |
| tree | ce4216013f96c7a5d9d7eb6710c481b8c94c6661 /spec/models | |
| parent | e4c86bc8871ce59cae84be2cd8cf3e1b94b50c8d (diff) | |
| parent | 51db45301921c4d6b02bcf230ae315c718b03c5d (diff) | |
Merge branch 'fix-slack-pipeline-event' into 'master'
Fix pipeline author for Slack and use pipeline id for pipeline link
[Context](https://gitlab.slack.com/archives/runner-builds/p1479238493000018)
Pipeline Slack message:
> gitlab-org/gitlab-ci-multi-runner: Pipeline 8bed2a3b of fix/handle-failed-state-while-patching-trace branch by failed in 1389 seconds
Quotes:
> @godfat Take a look at these notifications, they seems to be missing author and should probably use Pipeline ID instead of SHA
See merge request !7506
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/project_services/slack_service/pipeline_message_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 babb3909f56..363138a9454 100644 --- a/spec/models/project_services/slack_service/pipeline_message_spec.rb +++ b/spec/models/project_services/slack_service/pipeline_message_spec.rb @@ -15,7 +15,7 @@ describe SlackService::PipelineMessage do }, project: { path_with_namespace: 'project_name', web_url: 'example.gitlab.com' }, - commit: { author_name: 'hacker' } + user: { name: 'hacker' } } end @@ -48,7 +48,7 @@ describe SlackService::PipelineMessage do def build_message(status_text = status) "<example.gitlab.com|project_name>:" \ - " Pipeline <example.gitlab.com/pipelines/123|97de212e>" \ + " Pipeline <example.gitlab.com/pipelines/123|#123>" \ " of <example.gitlab.com/commits/develop|develop> branch" \ " by hacker #{status_text} in #{duration} #{'second'.pluralize(duration)}" end |