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

Print new project information in post receive

See merge request gitlab-org/gitlab-shell!186

4 files changed, 31 insertions, 20 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6123299..0a5c8d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v6.0.3
+  - Print new project information in post-receive
+
 v6.0.2
   - Use grpc-go 1.9.1 (!184)
   - Update gitaly-proto and gitaly libs (!185)
diff --git a/VERSION b/VERSION
index 9b9a244..090ea9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.2
+6.0.3
diff --git a/lib/gitlab_post_receive.rb b/lib/gitlab_post_receive.rb
index 3f411a0..55b00bb 100644
--- a/lib/gitlab_post_receive.rb
+++ b/lib/gitlab_post_receive.rb
@@ -27,6 +27,7 @@ class GitlabPostReceive
     print_broadcast_message(response['broadcast_message']) if response['broadcast_message']
     print_merge_request_links(response['merge_request_urls']) if response['merge_request_urls']
     puts response['redirected_message'] if response['redirected_message']
+    puts response['project_created_message'] if response['project_created_message']
 
     response['reference_counter_decreased']
   rescue GitlabNet::ApiUnreachableError
diff --git a/spec/gitlab_post_receive_spec.rb b/spec/gitlab_post_receive_spec.rb
index 1b43db0..ec7e248 100644
--- a/spec/gitlab_post_receive_spec.rb
+++ b/spec/gitlab_post_receive_spec.rb
@@ -62,20 +62,12 @@ describe GitlabPostReceive do
     end
 
     context 'when redirected message available' do
-      let(:message) do
-        <<-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(:message) { "This is a redirected message" }
       let(:response) do
-        { 
+        {
           'reference_counter_decreased' => true,
           'redirected_message' => message
-        } 
+        }
       end
 
       it 'prints redirected message' do
@@ -83,6 +75,24 @@ describe GitlabPostReceive do
         assert_redirected_message_printed(gitlab_post_receive)
         expect(gitlab_post_receive.exec).to eq(true)
       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
 
@@ -129,15 +139,12 @@ describe GitlabPostReceive do
       "========================================================================"
     ).ordered
   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
-          MSG
-    expect(gitlab_post_receive).to receive(:puts).with(message).ordered
+  def assert_project_created_message_printed(gitlab_post_receive)
+    expect(gitlab_post_receive).to receive(:puts).with("This is a created project message")
   end
 end