Fix post receive url with empty post and triggers

Author: alexandermeindl

Diff for: app/services/redmine_hooks/call_webservices.rb

@@ -29,7 +29,6 @@ def post_receive_url
     end
 
     def needs_push?
-      return true if post_receive_url.mode == :post
       return false if payloads.empty?
       return true unless use_triggers?
       return false if post_receive_url.triggers.empty?
@@ -52,13 +51,21 @@ def skip_message
       "This url doesn't need to be notified"
     end
 
+    def with_empty_payload?
+      post_receive_url.mode == :post
+    end
+
+    def empty_payload
+      { empty: true }
+    end
+
     private
 
     def set_payloads_to_send
-      @payloads_to_send = if post_receive_url.mode == :post
-                            {}
-                          elsif use_triggers?
+      @payloads_to_send = if use_triggers?
                             extract_payloads
+                          elsif with_empty_payload?
+                            empty_payload
                           else
                             payloads
                           end
@@ -68,7 +75,9 @@ def extract_payloads
       new_payloads = []
       payloads.each do |payload|
         data = RedmineGitHosting::Utils::Git.parse_refspec payload[:ref]
-        new_payloads << payload if data[:type] == 'heads' && post_receive_url.triggers.include?(data[:name])
+        next unless data[:type] == 'heads' && post_receive_url.triggers.include?(data[:name])
+
+        new_payloads << (with_empty_payload? ? empty_payload : payload)
       end
       new_payloads
     end

Diff for: spec/services/redmine_hooks/call_webservices_spec.rb

@@ -38,13 +38,19 @@ def build_web_hook(payload, **opts)
 
     context 'when triggers is set to master' do
       it 'should return the master payload' do
-        web_hook = build_web_hook global_payload, use_triggers: true, triggers: ['master']
+        web_hook = build_web_hook global_payload, use_triggers: true, mode: :github, triggers: ['master']
         expect(web_hook.needs_push?).to be true
+        expect(web_hook.with_empty_payload?).to be false
         expect(web_hook.payloads_to_send).to eq master_payload
       end
-    end
 
-    context 'when triggers is set to master' do
+      it 'should return the empty payload if mode is post' do
+        web_hook = build_web_hook global_payload, use_triggers: true, mode: :post, triggers: ['master']
+        expect(web_hook.needs_push?).to be true
+        expect(web_hook.with_empty_payload?).to be true
+        expect(web_hook.payloads_to_send).to eq [web_hook.empty_payload]
+      end
+
       it 'should not be found in branches payload and return false' do
         web_hook = build_web_hook branches_payload, use_triggers: true, triggers: ['master']
         expect(web_hook.needs_push?).to be false