reject new pull requests that are not mergeable

iain · Aug 9, 2012 · 8044e10 · 8044e10
1 parent 8f4bd31
commit 8044e10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/travis/github/payload/pull_request.rb b/lib/travis/github/payload/pull_request.rb
@@ -15,7 +15,11 @@ def event
         end
 
         def accept?
-          [:opened, :reopened].include?(action) || action == :synchronize && head_change?
+          case action
+          when :opened, :reopened then !!merge_commit
+          when :synchronize       then head_change?
+          else false
+          end
         end
 
         def head_change?

diff --git a/spec/travis/github/payload/pull_request_spec.rb b/spec/travis/github/payload/pull_request_spec.rb
@@ -12,6 +12,11 @@
       it 'returns true' do
         payload.accept?.should be_true
       end
+
+      it 'rejects it if there is no merge commit' do
+        payload.event.data['pull_request']['merge_commit'] = nil
+        payload.should_not be_accept
+      end
     end
 
     describe 'given action is "reopened"' do