Commit ec2806f1 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'print-new-project-in-post-receive' into 'master'

Print new project information in post receive

See merge request gitlab-org/gitlab-shell!186
parents e102be67 d0dc169b
v6.0.3
- Print new project information in post-receive
v6.0.2 v6.0.2
- Use grpc-go 1.9.1 (!184) - Use grpc-go 1.9.1 (!184)
- Update gitaly-proto and gitaly libs (!185) - Update gitaly-proto and gitaly libs (!185)
......
...@@ -27,6 +27,7 @@ class GitlabPostReceive ...@@ -27,6 +27,7 @@ class GitlabPostReceive
print_broadcast_message(response['broadcast_message']) if response['broadcast_message'] print_broadcast_message(response['broadcast_message']) if response['broadcast_message']
print_merge_request_links(response['merge_request_urls']) if response['merge_request_urls'] print_merge_request_links(response['merge_request_urls']) if response['merge_request_urls']
puts response['redirected_message'] if response['redirected_message'] puts response['redirected_message'] if response['redirected_message']
puts response['project_created_message'] if response['project_created_message']
response['reference_counter_decreased'] response['reference_counter_decreased']
rescue GitlabNet::ApiUnreachableError rescue GitlabNet::ApiUnreachableError
......
...@@ -62,20 +62,12 @@ describe GitlabPostReceive do ...@@ -62,20 +62,12 @@ describe GitlabPostReceive do
end end
context 'when redirected message available' do context 'when redirected message available' do
let(:message) do let(:message) { "This is a redirected message" }
<<-MSG
Project 'foo/bar' was moved to 'foo/baz'.
Please update your Git remote:
git remote set-url origin http://localhost:3000/foo/baz.git
MSG
end
let(:response) do let(:response) do
{ {
'reference_counter_decreased' => true, 'reference_counter_decreased' => true,
'redirected_message' => message 'redirected_message' => message
} }
end end
it 'prints redirected message' do it 'prints redirected message' do
...@@ -83,6 +75,24 @@ describe GitlabPostReceive do ...@@ -83,6 +75,24 @@ describe GitlabPostReceive do
assert_redirected_message_printed(gitlab_post_receive) assert_redirected_message_printed(gitlab_post_receive)
expect(gitlab_post_receive.exec).to eq(true) expect(gitlab_post_receive.exec).to eq(true)
end end
context 'when project created message is available' do
let(:message) { "This is a created project message" }
let(:response) do
{
'reference_counter_decreased' => true,
'project_created_message' => message
}
end
it 'prints project created message' do
expect_any_instance_of(GitlabNet).to receive(:post_receive).and_return(response)
assert_project_created_message_printed(gitlab_post_receive)
expect(gitlab_post_receive.exec).to be true
end
end
end end
end end
...@@ -129,15 +139,12 @@ describe GitlabPostReceive do ...@@ -129,15 +139,12 @@ describe GitlabPostReceive do
"========================================================================" "========================================================================"
).ordered ).ordered
end end
def assert_redirected_message_printed(gitlab_post_receive)
message = <<-MSG
Project 'foo/bar' was moved to 'foo/baz'.
Please update your Git remote: def assert_redirected_message_printed(gitlab_post_receive)
expect(gitlab_post_receive).to receive(:puts).with("This is a redirected message")
end
git remote set-url origin http://localhost:3000/foo/baz.git def assert_project_created_message_printed(gitlab_post_receive)
MSG expect(gitlab_post_receive).to receive(:puts).with("This is a created project message")
expect(gitlab_post_receive).to receive(:puts).with(message).ordered
end end
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