shipit-engine 0.15.0 → 0.16.0

data/test/models/commits_test.rb

@@ -30,11 +30,6 @@ module Shipit
       assert_nil @commit.pull_request_title
     end
 
-    test "#pull_request_url build the pull request url from the message" do
-      assert_equal 'https://github.com/shopify/shipit-engine/pull/31', @pr.pull_request_url
-      assert_nil @commit.pull_request_url
-    end
-
     test "#newer_than(nil) returns all commits" do
       assert_equal @stack.commits.all.to_a, @stack.commits.newer_than(nil).to_a
     end
@@ -254,29 +249,19 @@ module Shipit
       assert_equal 'pending', @commit.reload.state
     end
 
-    test "#last_statuses returns the list of the most recent status of each context" do
-      assert_equal 4, shipit_commits(:second).statuses.count
-      assert_equal 2, shipit_commits(:second).last_statuses.count
-    end
-
-    test "#last_statuses returns [UnknownStatus] if the commit has no statuses" do
-      commit = shipit_commits(:second)
-      commit.statuses = []
-      assert_equal UnknownStatus.new(commit), commit.significant_status
-    end
-
-    test "#status returns UnknownStatus if the commit has no status" do
+    test "#status returns an unknown if the commit has no statuses" do
       commit = shipit_commits(:second)
       commit.statuses = []
-      assert_equal UnknownStatus.new(commit), commit.status
+      assert_predicate commit.status, :unknown?
     end
 
-    test "#visible_statuses rejects the statuses that are specified in the deploy spec's `ci.hide`" do
+    test "#status rejects the statuses that are specified in the deploy spec's `ci.hide`" do
       commit = shipit_commits(:second)
-      assert_equal 2, commit.visible_statuses.count
+      assert_predicate commit.status, :group?
+      assert_equal 2, commit.status.size
       commit.stack.update!(cached_deploy_spec: DeploySpec.new('ci' => {'hide' => 'metrics/coveralls'}))
       commit.reload
-      assert_equal 1, commit.visible_statuses.size
+      refute_predicate commit.status, :group?
     end
 
     test "#deployable? is true if commit status is 'success'" do
@@ -343,8 +328,10 @@ module Shipit
     end
 
     test "#add_status does not fire webhooks for invisible statuses" do
+      @stack.deploys_and_rollbacks.destroy_all
       commit = shipit_commits(:second)
       assert commit.stack.hooks.where(events: ['commit_status']).size >= 1
+      refute_predicate commit, :deployed?
 
       expect_no_hook(:deployable_status) do
         github_status = OpenStruct.new(
@@ -358,8 +345,10 @@ module Shipit
     end
 
     test "#add_status does not fire webhooks for non-meaningful statuses" do
+      @stack.deploys_and_rollbacks.destroy_all
       commit = shipit_commits(:second)
       assert commit.stack.hooks.where(events: ['commit_status']).size >= 1
+      refute_predicate commit, :deployed?
 
       expect_no_hook(:deployable_status) do
         github_status = OpenStruct.new(
@@ -372,27 +361,38 @@ module Shipit
       end
     end
 
-    test "#visible_statuses forward the last_statuses to the stack" do
+    test "#add_status does not fire webhooks for already deployed commits" do
       commit = shipit_commits(:second)
-      stack = commit.stack
-      stack.expects(:filter_visible_statuses).with(commit.last_statuses)
-      commit.visible_statuses
+      assert_predicate commit, :deployed?
+
+      expect_no_hook(:deployable_status) do
+        github_status = OpenStruct.new(
+          state: 'failure',
+          description: 'Sad',
+          context: 'ci/travis',
+          created_at: 1.day.ago.to_s(:db),
+        )
+        commit.create_status_from_github!(github_status)
+      end
     end
 
-    test "#meaningful_statuses forward the last_statuses to the stack" do
+    test "#add_status schedule a MergePullRequests job if the commit transition to `pending` or `success`" do
       commit = shipit_commits(:second)
-      stack = commit.stack
-      stack.expects(:filter_meaningful_statuses).with(commit.last_statuses)
-      commit.meaningful_statuses
-    end
+      github_status = OpenStruct.new(
+        state: 'success',
+        description: 'Cool',
+        context: 'metrics/coveralls',
+        created_at: 1.day.ago.to_s(:db),
+      )
 
-    test "#significant_status is UnknownStatus when the commit has no statuses" do
-      commit = shipit_commits(:first)
-      commit.statuses = []
-      assert_equal UnknownStatus.new(commit), commit.significant_status
+      assert_equal 'failure', commit.state
+      assert_enqueued_with(job: MergePullRequestsJob, args: [@commit.stack]) do
+        commit.create_status_from_github!(github_status)
+        assert_equal 'success', commit.state
+      end
     end
 
-    test "#significant_status hierarchy uses failures and errors, then pending, then successes, then UnknownStatus" do
+    test "#status hierarchy uses failures and errors, then pending, then successes, then Status::Unknown" do
       commit = shipit_commits(:first)
       pending = commit.statuses.new(stack_id: @stack.id, state: 'pending', context: 'ci/pending')
       failure = commit.statuses.new(stack_id: @stack.id, state: 'failure', context: 'ci/failure')
@@ -400,37 +400,92 @@ module Shipit
       success = commit.statuses.new(stack_id: @stack.id, state: 'success', context: 'ci/success')
 
       commit.reload.statuses = [pending, failure, success, error]
-      assert_includes [error, failure], commit.significant_status
+      assert_equal 'error', commit.status.state
 
       commit.reload.statuses = [pending, failure, success]
-      assert_equal failure, commit.significant_status
+      assert_equal 'failure', commit.status.state
 
       commit.reload.statuses = [pending, error, success]
-      assert_equal error, commit.significant_status
+      assert_equal 'error', commit.status.state
 
       commit.reload.statuses = [success, pending]
-      assert_equal pending, commit.significant_status
+      assert_equal 'pending', commit.status.state
 
       commit.reload.statuses = [success]
-      assert_equal success, commit.significant_status
+      assert_equal 'success', commit.status.state
 
       commit.reload.statuses = []
-      assert_equal UnknownStatus.new(commit), commit.significant_status
+      assert_equal 'unknown', commit.status.state
     end
 
-    test "#significant_status is UnknownStatus when the commit has statuses but none meaningful" do
-      commit = shipit_commits(:first)
-      commit.stubs(meaningful_statuses: [])
-      assert_equal UnknownStatus.new(commit), commit.significant_status
+    test "merge commits are linked to the matching Pull Request if there is one" do
+      commit = @stack.commits.create!(
+        author: shipit_users(:shipit),
+        authored_at: Time.now,
+        committer: shipit_users(:shipit),
+        committed_at: Time.now,
+        sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
+        message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!",
+      )
+      pull_request = shipit_pull_requests(:shipit_pending)
+
+      assert_predicate commit, :pull_request?
+      assert_equal 62, commit.pull_request_number
+      assert_equal pull_request.title, commit.pull_request_title
+      assert_equal pull_request, commit.pull_request
+    end
+
+    test "merge commits infer pull request number and title from the message if it's not a known pull request" do
+      commit = @stack.commits.create!(
+        author: shipit_users(:shipit),
+        authored_at: Time.now,
+        committer: shipit_users(:shipit),
+        committed_at: Time.now,
+        sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
+        message: "Merge pull request #99 from shipit-engine/yoloshipit\n\nyoloshipit!",
+      )
+
+      assert_predicate commit, :pull_request?
+      assert_equal 99, commit.pull_request_number
+      assert_equal 'yoloshipit!', commit.pull_request_title
+      assert_nil commit.pull_request
+    end
+
+    test "the merge requester if known overrides the commit author" do
+      commit = @stack.commits.create!(
+        author: shipit_users(:shipit),
+        authored_at: Time.now,
+        committer: shipit_users(:shipit),
+        committed_at: Time.now,
+        sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
+        message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!",
+      )
+
+      assert_equal shipit_users(:walrus), commit.author
+    end
+
+    test "#pull_request_number and #pull_request_title are nil if the message is not a merge commit message" do
+      commit = @stack.commits.create!(
+        author: shipit_users(:shipit),
+        authored_at: Time.now,
+        committer: shipit_users(:shipit),
+        committed_at: Time.now,
+        sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
+        message: "Yoloshipit!",
+      )
+
+      refute_predicate commit, :pull_request?
+      assert_nil commit.pull_request_number
+      assert_nil commit.pull_request_title
+      assert_nil commit.pull_request
     end
 
     private
 
     def expect_event(stack)
-      Pubsubstub::RedisPubSub.expects(:publish).at_least_once
-      Pubsubstub::RedisPubSub.expects(:publish).with do |channel, event|
-        data = JSON.load(event.data)
-        channel == "stack.#{stack.id}" && data['url'] == "/#{stack.to_param}"
+      Pubsubstub.expects(:publish).at_least_once
+      Pubsubstub.expects(:publish).with do |channel, _payload, _options = {}|
+        channel == "stack.#{stack.id}"
       end
     end
 

data/test/{unit → models}/deploy_spec_test.rb

@@ -126,6 +126,29 @@ module Shipit
       assert_equal ["kubernetes-deploy foo bar"], @spec.deploy_steps
     end
 
+    test "#deploy_steps returns kubernetes-deploy command if both capfile and `kubernetes` are present" do
+      @spec.stubs(:bundler?).returns(true)
+      @spec.stubs(:capistrano?).returns(true)
+      @spec.stubs(:load_config).returns(
+        'kubernetes' => {
+          'namespace' => 'foo',
+          'context' => 'bar',
+        },
+      )
+      assert_equal ["kubernetes-deploy foo bar"], @spec.deploy_steps
+    end
+
+    test "#deploy_steps returns kubernetes command if `kubernetes` is present and template_dir is set" do
+      @spec.stubs(:load_config).returns(
+        'kubernetes' => {
+          'namespace' => 'foo',
+          'context' => 'bar',
+          'template_dir' => 'k8s_templates/',
+        },
+      )
+      assert_equal ["kubernetes-deploy --template-dir k8s_templates/ foo bar"], @spec.deploy_steps
+    end
+
     test "#deploy_steps prepend and append pre and post steps" do
       @spec.stubs(:load_config).returns('deploy' => {'pre' => ['before'], 'post' => ['after']})
       @spec.expects(:bundler?).returns(true).at_least_once
@@ -168,20 +191,21 @@ module Shipit
       assert_equal ["kubernetes-deploy foo bar"], @spec.rollback_steps
     end
 
-    test '#machine_env returns an environment hash' do
-      @spec.stubs(:load_config).returns('machine' => {'environment' => {'GLOBAL' => '1'}})
-      assert_equal({'GLOBAL' => '1'}, @spec.machine_env)
-    end
-
-    test '#discover_machine_env contains K8S_TEMPLATE_FOLDER if `kubernetes.template_dir` is present' do
+    test "#rollback_steps returns kubernetes-deploy command when both capfile and `kubernetes` are present" do
+      @spec.stubs(:bundler?).returns(true)
+      @spec.stubs(:capistrano?).returns(true)
       @spec.stubs(:load_config).returns(
         'kubernetes' => {
           'namespace' => 'foo',
           'context' => 'bar',
-          'template_dir' => '/egg/spam',
         },
       )
-      assert_equal '/egg/spam', @spec.discover_machine_env['K8S_TEMPLATE_FOLDER']
+      assert_equal ["kubernetes-deploy foo bar"], @spec.rollback_steps
+    end
+
+    test '#machine_env returns an environment hash' do
+      @spec.stubs(:load_config).returns('machine' => {'environment' => {'GLOBAL' => '1'}})
+      assert_equal({'GLOBAL' => '1'}, @spec.machine_env)
     end
 
     test '#load_config can grab the env-specific shipit.yml file' do
@@ -256,12 +280,21 @@ module Shipit
       assert_instance_of DeploySpec::FileSystem, @spec
       assert_instance_of DeploySpec, @spec.cacheable
       config = {
-        'ci' => {'hide' => [], 'allow_failures' => [], 'require' => []},
+        'merge' => {
+          'require' => [],
+          'ignore' => [],
+          'revalidate_after' => nil,
+        },
+        'ci' => {
+          'hide' => [],
+          'allow_failures' => [],
+          'require' => [],
+        },
         'machine' => {'environment' => {}, 'directory' => nil, 'cleanup' => true},
         'review' => {'checklist' => [], 'monitoring' => [], 'checks' => []},
         'dependencies' => {'override' => []},
         'plugins' => {},
-        'deploy' => {'override' => nil, 'variables' => [], 'max_commits' => nil, 'interval' => 0},
+        'deploy' => {'override' => nil, 'variables' => [], 'max_commits' => 8, 'interval' => 0},
         'rollback' => {'override' => nil},
         'fetch' => nil,
         'tasks' => {},
@@ -380,6 +413,99 @@ module Shipit
       assert_equal %w(ci/circleci ci/jenkins), @spec.hidden_statuses
     end
 
+    test "pull_request_ignored_statuses defaults to the union of ci.hide and ci.allow_failures" do
+      @spec.expects(:load_config).returns(
+        'ci' => {
+          'hide' => %w(ci/circleci ci/jenkins),
+          'allow_failures' => %w(ci/circleci ci/travis),
+        },
+      )
+      assert_equal %w(ci/circleci ci/jenkins ci/travis).sort, @spec.pull_request_ignored_statuses.sort
+    end
+
+    test "pull_request_ignored_statuses defaults to empty if `merge.require` is present" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'require' => 'bar',
+        },
+        'ci' => {
+          'hide' => %w(ci/circleci ci/jenkins),
+          'allow_failures' => %w(ci/circleci ci/travis),
+        },
+      )
+      assert_equal [], @spec.pull_request_ignored_statuses
+    end
+
+    test "pull_request_ignored_statuses returns `merge.ignore` if present" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'ignore' => 'bar',
+        },
+        'ci' => {
+          'hide' => %w(ci/circleci ci/jenkins),
+          'allow_failures' => %w(ci/circleci ci/travis),
+        },
+      )
+      assert_equal ['bar'], @spec.pull_request_ignored_statuses
+    end
+
+    test "pull_request_required_statuses defaults to ci.require" do
+      @spec.expects(:load_config).returns(
+        'ci' => {
+          'require' => %w(ci/circleci ci/jenkins),
+        },
+      )
+      assert_equal %w(ci/circleci ci/jenkins), @spec.pull_request_required_statuses
+    end
+
+    test "pull_request_required_statuses defaults to empty if `merge.ignore` is present" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'ignore' => 'bar',
+        },
+        'ci' => {
+          'require' => %w(ci/circleci ci/jenkins),
+        },
+      )
+      assert_equal [], @spec.pull_request_required_statuses
+    end
+
+    test "pull_request_required_statuses returns `merge.require` if present" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'require' => 'bar',
+        },
+        'ci' => {
+          'hide' => %w(ci/circleci ci/jenkins),
+          'allow_failures' => %w(ci/circleci ci/travis),
+        },
+      )
+      assert_equal ['bar'], @spec.pull_request_required_statuses
+    end
+
+    test "revalidate_pull_requests_after defaults to `nil" do
+      @spec.expects(:load_config).returns({})
+      assert_nil @spec.revalidate_pull_requests_after
+    end
+
+    test "revalidate_pull_requests_after defaults to `nil` if `merge.timeout` cannot be parsed" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'revalidate_after' => 'ALSKhfjsdkf',
+        },
+      )
+      assert_nil @spec.revalidate_pull_requests_after
+    end
+
+    test "revalidate_after returns `merge.revalidate_after` if present" do
+      @spec.expects(:load_config).returns(
+        'merge' => {
+          'revalidate_after' => '5m30s',
+        },
+      )
+      assert_equal 330, @spec.revalidate_pull_requests_after.to_i
+    end
+
     test "#file is impacted by `machine.directory`" do
       subdir = '/foo/bar'
       @spec.stubs(:load_config).returns('machine' => {'directory' => subdir})
@@ -495,9 +621,9 @@ module Shipit
       assert_equal ['yarn install --no-progress'], @spec.dependencies_steps
     end
 
-    test '#publish_yarn_package checks if version tag exists, and then invokes yarn publish script' do
+    test '#publish_yarn_package checks if version tag exists, and then invokes npm publish script' do
       @spec.stubs(:yarn?).returns(true).at_least_once
-      assert_equal ['assert-npm-version-tag', 'yarn publish'], @spec.deploy_steps
+      assert_equal ['assert-npm-version-tag', 'npm publish'], @spec.deploy_steps
     end
 
     test 'yarn checklist takes precedence over npm checklist' do

data/test/models/deploys_test.rb

@@ -225,6 +225,13 @@ module Shipit
       end
     end
 
+    test "transitioning to success schedule a MergePullRequests job" do
+      @deploy = shipit_deploys(:shipit_running)
+      assert_enqueued_with(job: MergePullRequestsJob, args: [@deploy.stack]) do
+        @deploy.complete!
+      end
+    end
+
     test "transitioning to success schedule a fetch of the deployed revision" do
       @deploy = shipit_deploys(:shipit_running)
       assert_enqueued_with(job: FetchDeployedRevisionJob, args: [@deploy.stack]) do
@@ -440,10 +447,9 @@ module Shipit
     private
 
     def expect_event(deploy)
-      Pubsubstub::RedisPubSub.expects(:publish).at_least_once
-      Pubsubstub::RedisPubSub.expects(:publish).with do |channel, event|
-        data = JSON.load(event.data)
-        channel == "stack.#{deploy.stack.id}" && data['url'] == "/#{deploy.stack.to_param}"
+      Pubsubstub.expects(:publish).at_least_once
+      Pubsubstub.expects(:publish).with do |channel, _payload, _options|
+        channel == "stack.#{deploy.stack.id}"
       end
     end
   end

data/test/models/pull_request_test.rb

@@ -0,0 +1,197 @@
+require 'test_helper'
+
+module Shipit
+  class PullRequestTest < ActiveSupport::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @pr = shipit_pull_requests(:shipit_pending)
+      @user = shipit_users(:walrus)
+    end
+
+    test ".request_merge! creates a record and schedule a refresh" do
+      pull_request = nil
+      assert_enqueued_with(job: RefreshPullRequestJob) do
+        pull_request = PullRequest.request_merge!(@stack, 64, @user)
+      end
+      assert_predicate pull_request, :persisted?
+    end
+
+    test ".request_merge! only track pull requests once" do
+      assert_difference -> { PullRequest.count }, +1 do
+        5.times { PullRequest.request_merge!(@stack, 65, @user) }
+      end
+    end
+
+    test ".request_merge! retry canceled pull requests" do
+      original_merge_requested_at = @pr.merge_requested_at
+      @pr.cancel!
+      assert_predicate @pr, :canceled?
+      PullRequest.request_merge!(@stack, @pr.number, @user)
+      assert_predicate @pr.reload, :pending?
+      assert_not_equal original_merge_requested_at, @pr.merge_requested_at
+      assert_in_delta Time.now.utc, @pr.merge_requested_at, 1
+    end
+
+    test ".request_merge! retry rejected pull requests" do
+      original_merge_requested_at = @pr.merge_requested_at
+      @pr.reject!('merge_conflict')
+      assert_predicate @pr, :rejected?
+      PullRequest.request_merge!(@stack, @pr.number, @user)
+      assert_predicate @pr.reload, :pending?
+      assert_not_equal original_merge_requested_at, @pr.merge_requested_at
+      assert_in_delta Time.now.utc, @pr.merge_requested_at, 1
+      assert_nil @pr.rejection_reason
+    end
+
+    test ".request_merge! retry revalidating pull requests but keep the original request time" do
+      original_merge_requested_at = @pr.merge_requested_at
+      @pr.revalidate!
+      assert_predicate @pr, :revalidating?
+      PullRequest.request_merge!(@stack, @pr.number, @user)
+      assert_predicate @pr.reload, :pending?
+      assert_equal original_merge_requested_at, @pr.merge_requested_at
+    end
+
+    test ".extract_number can get a pull request number from different formats" do
+      assert_equal 42, PullRequest.extract_number(@stack, '42')
+      assert_equal 42, PullRequest.extract_number(@stack, '#42')
+      assert_equal 42, PullRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
+
+      assert_nil PullRequest.extract_number(@stack, 'https://github.com/ACME/shipit-engine/pull/42')
+
+      Shipit.expects(:github_domain).returns('github.acme.com').at_least_once
+      assert_equal 42, PullRequest.extract_number(@stack, 'https://github.acme.com/Shopify/shipit-engine/pull/42')
+      assert_nil PullRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
+    end
+
+    test "refresh! pulls state from GitHub" do
+      pull_request = shipit_pull_requests(:shipit_fetching)
+
+      head_sha = '64b3833d39def7ec65b57b42f496eb27ab4980b6'
+      Shipit.github_api.expects(:pull_request).with(@stack.github_repo_name, pull_request.number).returns(
+        stub(
+          id: 4_857_578,
+          url: 'https://api.github.com/repos/Shopify/shipit-engine/pulls/64',
+          title: 'Great feature',
+          state: 'open',
+          mergeable: true,
+          additions: 24,
+          deletions: 5,
+          head: stub(
+            ref: 'super-branch',
+            sha: head_sha,
+          ),
+        ),
+      )
+
+      author = stub(
+        id: 1234,
+        login: 'bob',
+        name: 'Bob the Builder',
+        email: 'bob@bob.com',
+      )
+      Shipit.github_api.expects(:commit).with(@stack.github_repo_name, head_sha).returns(
+        stub(
+          sha: head_sha,
+          author: author,
+          committer: author,
+          commit: stub(
+            message: 'Great feature',
+            author: stub(date: 1.day.ago),
+            committer: stub(date: 1.day.ago),
+          ),
+          stats: stub(
+            additions: 24,
+            deletions: 5,
+          ),
+        ),
+      )
+
+      Shipit.github_api.expects(:statuses).with(@stack.github_repo_name, head_sha).returns([stub(
+        state: 'success',
+        description: nil,
+        context: 'default',
+        target_url: 'http://example.com',
+        created_at: 1.day.ago,
+      )])
+
+      pull_request.refresh!
+
+      assert_predicate pull_request, :mergeable?
+      assert_predicate pull_request, :pending?
+      assert_equal 'super-branch', pull_request.branch
+
+      assert_not_nil pull_request.head
+      assert_predicate pull_request.head, :detached?
+      assert_predicate pull_request.head, :success?
+    end
+
+    test "#reject! records the reason" do
+      @pr.reject!('merge_conflict')
+      assert_equal 'merge_conflict', @pr.rejection_reason
+    end
+
+    test "transitionning from rejected to any other state clear the rejection reason" do
+      @pr.reject!('merge_conflict')
+      assert_equal 'merge_conflict', @pr.rejection_reason
+      @pr.retry!
+      assert_nil @pr.rejection_reason
+      assert_nil @pr.reload.rejection_reason
+    end
+
+    test "#reject_unless_mergeable! returns `false` if the PR is not yet mergeable" do
+      @pr.update!(mergeable: nil)
+      assert_predicate @pr, :not_mergeable_yet?
+      assert_equal false, @pr.reject_unless_mergeable!
+      assert_predicate @pr, :pending?
+    end
+
+    test "#reject_unless_mergeable! rejects the PR if it has a merge conflict" do
+      @pr.update!(mergeable: false)
+
+      assert_predicate @pr, :merge_conflict?
+      assert_equal true, @pr.reject_unless_mergeable!
+      assert_predicate @pr, :rejected?
+      assert_equal 'merge_conflict', @pr.rejection_reason
+    end
+
+    test "#reject_unless_mergeable! rejects the PR if it has a failing or pending CI status" do
+      @pr.head.statuses.create!(stack: @pr.stack, state: 'pending', context: 'ci/circle')
+
+      refute_predicate @pr, :all_status_checks_passed?
+      assert_equal true, @pr.reject_unless_mergeable!
+      assert_predicate @pr, :rejected?
+      assert_equal 'ci_failing', @pr.rejection_reason
+    end
+
+    test "#merge! revalidates the PR if it has been enqueued for too long" do
+      @pr.update!(revalidated_at: 5.hours.ago)
+
+      assert_predicate @pr, :need_revalidation?
+      assert_equal false, @pr.merge!
+      assert_predicate @pr, :revalidating?
+    end
+
+    test "#merge! raises a PullRequest::NotReady if the PR isn't mergeable yet" do
+      @pr.update!(mergeable: nil)
+
+      assert_predicate @pr, :not_mergeable_yet?
+      assert_raises PullRequest::NotReady do
+        @pr.merge!
+      end
+      @pr.reload
+      assert_predicate @pr, :pending?
+    end
+
+    test "status transitions emit hooks" do
+      job = assert_enqueued_with(job: EmitEventJob) do
+        @pr.reject!('merge_conflict')
+      end
+      params = job.arguments.first
+      assert_equal 'merge', params['event']
+      assert_json 'status', 'rejected', document: params['payload']
+      assert_json 'pull_request.rejection_reason', 'merge_conflict', document: params['payload']
+      assert_json 'pull_request.number', @pr.number, document: params['payload']
+    end
+  end
+end