Commit 958815a0 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'master' into 'master'

Changed Slack service user referencing from full name to username

Closes #22737

See merge request !6624
parents d5773103 df07d6ea
......@@ -42,6 +42,7 @@ v 8.13.0 (unreleased)
- Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Fix broken repository 500 errors in project list
- Close todos when accepting merge requests via the API !6486 (tonygambone)
- Changed Slack service user referencing from full name to username (Sebastian Poxhofer)
v 8.12.4 (unreleased)
......
......@@ -11,7 +11,7 @@ class IssueMessage < BaseMessage
attr_reader :description
def initialize(params)
@user_name = params[:user][:name]
@user_name = params[:user][:username]
@project_name = params[:project_name]
@project_url = params[:project_url]
......
......@@ -10,7 +10,7 @@ class MergeMessage < BaseMessage
attr_reader :title
def initialize(params)
@user_name = params[:user][:name]
@user_name = params[:user][:username]
@project_name = params[:project_name]
@project_url = params[:project_url]
......
......@@ -10,7 +10,7 @@ class NoteMessage < BaseMessage
def initialize(params)
params = HashWithIndifferentAccess.new(params)
@user_name = params[:user][:name]
@user_name = params[:user][:username]
@project_name = params[:project_name]
@project_url = params[:project_url]
......
......@@ -9,7 +9,7 @@ class WikiPageMessage < BaseMessage
attr_reader :description
def initialize(params)
@user_name = params[:user][:name]
@user_name = params[:user][:username]
@project_name = params[:project_name]
@project_url = params[:project_url]
......
......@@ -7,7 +7,7 @@
{
user: {
name: 'Test User',
username: 'Test User'
username: 'test.user'
},
project_name: 'project_name',
project_url: 'somewhere.com',
......@@ -40,7 +40,7 @@
context 'open' do
it 'returns a message regarding opening of issues' do
expect(subject.pretext).to eq(
'<somewhere.com|[project_name>] Issue opened by Test User')
'<somewhere.com|[project_name>] Issue opened by test.user')
expect(subject.attachments).to eq([
{
title: "#100 Issue title",
......@@ -60,7 +60,7 @@
it 'returns a message regarding closing of issues' do
expect(subject.pretext). to eq(
'<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by Test User')
'<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by test.user')
expect(subject.attachments).to be_empty
end
end
......
......@@ -7,7 +7,7 @@
{
user: {
name: 'Test User',
username: 'Test User'
username: 'test.user'
},
project_name: 'project_name',
project_url: 'somewhere.com',
......@@ -31,7 +31,7 @@
context 'open' do
it 'returns a message regarding opening of merge requests' do
expect(subject.pretext).to eq(
'Test User opened <somewhere.com/merge_requests/100|merge request !100> '\
'test.user opened <somewhere.com/merge_requests/100|merge request !100> '\
'in <somewhere.com|project_name>: *Issue title*')
expect(subject.attachments).to be_empty
end
......@@ -43,7 +43,7 @@
end
it 'returns a message regarding closing of merge requests' do
expect(subject.pretext).to eq(
'Test User closed <somewhere.com/merge_requests/100|merge request !100> '\
'test.user closed <somewhere.com/merge_requests/100|merge request !100> '\
'in <somewhere.com|project_name>: *Issue title*')
expect(subject.attachments).to be_empty
end
......
......@@ -7,7 +7,7 @@
@args = {
user: {
name: 'Test User',
username: 'username',
username: 'test.user',
avatar_url: 'http://fakeavatar'
},
project_name: 'project_name',
......@@ -37,7 +37,7 @@
it 'returns a message regarding notes on commits' do
message = SlackService::NoteMessage.new(@args)
expect(message.pretext).to eq("Test User commented on " \
expect(message.pretext).to eq("test.user commented on " \
"<url|commit 5f163b2b> in <somewhere.com|project_name>: " \
"*Added a commit message*")
expected_attachments = [
......@@ -63,7 +63,7 @@
it 'returns a message regarding notes on a merge request' do
message = SlackService::NoteMessage.new(@args)
expect(message.pretext).to eq("Test User commented on " \
expect(message.pretext).to eq("test.user commented on " \
"<url|merge request !30> in <somewhere.com|project_name>: " \
"*merge request title*")
expected_attachments = [
......@@ -90,7 +90,7 @@
it 'returns a message regarding notes on an issue' do
message = SlackService::NoteMessage.new(@args)
expect(message.pretext).to eq(
"Test User commented on " \
"test.user commented on " \
"<url|issue #20> in <somewhere.com|project_name>: " \
"*issue title*")
expected_attachments = [
......@@ -115,7 +115,7 @@
it 'returns a message regarding notes on a project snippet' do
message = SlackService::NoteMessage.new(@args)
expect(message.pretext).to eq("Test User commented on " \
expect(message.pretext).to eq("test.user commented on " \
"<url|snippet #5> in <somewhere.com|project_name>: " \
"*snippet title*")
expected_attachments = [
......
......@@ -9,7 +9,7 @@
before: 'before',
project_name: 'project_name',
ref: 'refs/heads/master',
user_name: 'user_name',
user_name: 'test.user',
project_url: 'url'
}
end
......@@ -26,7 +26,7 @@
it 'returns a message regarding pushes' do
expect(subject.pretext).to eq(
'user_name pushed to branch <url/commits/master|master> of '\
'test.user pushed to branch <url/commits/master|master> of '\
'<url|project_name> (<url/compare/before...after|Compare changes>)'
)
expect(subject.attachments).to eq([
......@@ -46,13 +46,13 @@
before: Gitlab::Git::BLANK_SHA,
project_name: 'project_name',
ref: 'refs/tags/new_tag',
user_name: 'user_name',
user_name: 'test.user',
project_url: 'url'
}
end
it 'returns a message regarding pushes' do
expect(subject.pretext).to eq('user_name pushed new tag ' \
expect(subject.pretext).to eq('test.user pushed new tag ' \
'<url/commits/new_tag|new_tag> to ' \
'<url|project_name>')
expect(subject.attachments).to be_empty
......@@ -66,7 +66,7 @@
it 'returns a message regarding a new branch' do
expect(subject.pretext).to eq(
'user_name pushed new branch <url/commits/master|master> to '\
'test.user pushed new branch <url/commits/master|master> to '\
'<url|project_name>'
)
expect(subject.attachments).to be_empty
......@@ -80,7 +80,7 @@
it 'returns a message regarding a removed branch' do
expect(subject.pretext).to eq(
'user_name removed branch master from <url|project_name>'
'test.user removed branch master from <url|project_name>'
)
expect(subject.attachments).to be_empty
end
......
......@@ -7,7 +7,7 @@
{
user: {
name: 'Test User',
username: 'Test User'
username: 'test.user'
},
project_name: 'project_name',
project_url: 'somewhere.com',
......@@ -25,7 +25,7 @@
it 'returns a message that a new wiki page was created' do
expect(subject.pretext).to eq(
'Test User created <url|wiki page> in <somewhere.com|project_name>: '\
'test.user created <url|wiki page> in <somewhere.com|project_name>: '\
'*Wiki page title*')
end
end
......@@ -35,7 +35,7 @@
it 'returns a message that a wiki page was updated' do
expect(subject.pretext).to eq(
'Test User edited <url|wiki page> in <somewhere.com|project_name>: '\
'test.user edited <url|wiki page> in <somewhere.com|project_name>: '\
'*Wiki page title*')
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment