shipit-engine 0.33.0 → 0.34.0

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/dummy/config/application.rb

@@ -17,7 +17,7 @@ end
 
 module Shipit
   class Application < Rails::Application
-    config.load_defaults 6.0
+    config.load_defaults 6.1
   end
 end
 

data/test/dummy/config/database.yml

@@ -1,3 +1,11 @@
+<% if ENV['DATABASE_URL'].present? %>
+development:
+  database: shipit_engine_development
+
+test:
+  database: shipit_engine_test
+
+<% else %>
 default: &default
   adapter: sqlite3
 
@@ -8,3 +16,4 @@ development:
 test:
   <<: *default
   database: db/test.sqlite3
+<% end %>

data/test/dummy/config/environments/development.rb

@@ -50,7 +50,7 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
-  if Rails.application.config_for(:database)['adapter'] == 'sqlite3'
+  if Rails.application.config_for(:database)&.dig('adapter') == 'sqlite3'
     config.to_prepare do
       Shipit::DeferredTouch.enabled = false
     end

data/test/dummy/config/secrets_double_github_app.yml

@@ -0,0 +1,79 @@
+  github:
+    OrgOne:
+      domain: # defaults to github.com
+      app_id: 42
+      installation_id: 43
+      bot_login: "shipit[bot]"
+      webhook_secret: # nil
+      # Randomly generated
+      private_key: |
+        -----BEGIN RSA PRIVATE KEY-----
+        MIIEpAIBAAKCAQEA7iUQC2uUq/gtQg0gxtyaccuicYgmq1LUr1mOWbmwM1Cv63+S
+        73qo8h87FX+YyclY5fZF6SMXIys02JOkImGgbnvEOLcHnImCYrWs03msOzEIO/pG
+        M0YedAPtQ2MEiLIu4y8htosVxeqfEOPiq9kQgFxNKyETzjdIA9q1md8sofuJUmPv
+        ibacW1PecuAMnn+P8qf0XIDp7uh6noB751KvhCaCNTAPtVE9NZ18OmNG9GOyX/pu
+        pQHIrPgTpTG6KlAe3r6LWvemzwsMtuRGU+K+KhK9dFIlSE+v9rA32KScO8efOh6s
+        Gu3rWorV4iDu14U62rzEfdzzc63YL94sUbZxbwIDAQABAoIBADLJ8r8MxZtbhYN1
+        u0zOFZ45WL6v09dsBfITvnlCUeLPzYUDIzoxxcBFittN6C744x3ARS6wjimw+EdM
+        TZALlCSb/sA9wMDQzt7wchhz9Zh2H5RzDu+2f54sjDh38KqancdT8PO2fAFGxX/b
+        qicOVyeZB9gv6MJtJc20olBbuXAeBNfcDABF9oxF+0i+Ssg7B4VXiqgcjtGbr/Og
+        qRll7AqyTArVx2xEcVfZxeZ4zGnigzcJq4te7yYpxzwk+RxblkPh54Yt4WxZ+8DI
+        Rsn3r6ajlpwzpwvsJFU2Txq7xBTzGQMFmy/Pnjk83kP2cogxB2+tRyjITGqTwD8b
+        gg9PFCkCgYEA+7u8A0l0Cz6p0SI6c7ftVePVRiIhpawWN7og/wEmI6zUjm/3rA+R
+        hrhaVKuOD8QF/HdDsqTck5gjGAjTmJz6r33/cl1Tz+pr62znsrB4r0yMKvQbKN81
+        WGaWOsi2+ZXqLNv5h5wpUF0MTKlXHeKnwP5kuEvGwVn6WURFCh6PhLMCgYEA8i5e
+        JjulJVGyd5HuoY3xyO7E6DjidsqRnVRq+hYpORjnHvTmSwe4+tH4ha2p9Kv2Y6k3
+        C1NYY/fSMQoYCCRaYyJleI+la/9tsZqAmtms4ZB8KhFmPHf9fW75i6G0xKWyZ8K+
+        E2Ft/UaEiM282593cguV6+Kt5uExnyPxLLK4FlUCgYEAwRJ/JGI8/7bjFkTTYheq
+        j5q75BufhOrU6471acAe2XPgXxLfefdC3Xodxh0CS3NESBvNL4Ikr4sbN37lk4Kq
+        /th7iOKtuqUIeru/hZy2I3VpeDRbdGCmEJQ2GwYA2LKztg5Nd0Y9paaIHXAwIfrK
+        QUqcQ4HTAk8ZpUeoUBeaaeMCgYANLmbjb9WiPVsYVPIHCwHA7PX8qbPxwT7BsGmO
+        KQyfVfKmZa/vH4F67Vi4deZNMdrcO8aKMEQcVM2065a5QrlEsgeR00eupB1lUEJ1
+        qylUsZeAdqf43JMIc7TTW77KATa/nQLZbTEeWus1wvTngztuEqFbUGAks9cOkVc8
+        FpIcbQKBgQDVIL8gPLmn0f+4oLF8MBC+oxtKpz14X5iJ1saGFkzW5I+nIEskpS0S
+        qtirnTCnJFGdCrFwctnxiuiCmyGwpBYdjIfHyvYAHnqAtMnESzCUyeSFZiquVW5W
+        MvbMmDPoV27XOHU9kIq6NXtfrkpufiyo6/VEYWozXalxKLNuqLYfPQ==
+        -----END RSA PRIVATE KEY-----
+      oauth:
+        id: Iv1.bf2c2c45b449bfd9
+        secret: ef694cd6e45223075d78d138ef014049052665f1
+        teams:
+    OrgTwo:
+      domain: # defaults to github.com
+      app_id: 42
+      installation_id: 43
+      bot_login: "shipit[bot]"
+      webhook_secret: # nil
+      # Randomly generated
+      private_key: |
+        -----BEGIN RSA PRIVATE KEY-----
+        MIIEpAIBAAKCAQEA7iUQC2uUq/gtQg0gxtyaccuicYgmq1LUr1mOWbmwM1Cv63+S
+        73qo8h87FX+YyclY5fZF6SMXIys02JOkImGgbnvEOLcHnImCYrWs03msOzEIO/pG
+        M0YedAPtQ2MEiLIu4y8htosVxeqfEOPiq9kQgFxNKyETzjdIA9q1md8sofuJUmPv
+        ibacW1PecuAMnn+P8qf0XIDp7uh6noB751KvhCaCNTAPtVE9NZ18OmNG9GOyX/pu
+        pQHIrPgTpTG6KlAe3r6LWvemzwsMtuRGU+K+KhK9dFIlSE+v9rA32KScO8efOh6s
+        Gu3rWorV4iDu14U62rzEfdzzc63YL94sUbZxbwIDAQABAoIBADLJ8r8MxZtbhYN1
+        u0zOFZ45WL6v09dsBfITvnlCUeLPzYUDIzoxxcBFittN6C744x3ARS6wjimw+EdM
+        TZALlCSb/sA9wMDQzt7wchhz9Zh2H5RzDu+2f54sjDh38KqancdT8PO2fAFGxX/b
+        qicOVyeZB9gv6MJtJc20olBbuXAeBNfcDABF9oxF+0i+Ssg7B4VXiqgcjtGbr/Og
+        qRll7AqyTArVx2xEcVfZxeZ4zGnigzcJq4te7yYpxzwk+RxblkPh54Yt4WxZ+8DI
+        Rsn3r6ajlpwzpwvsJFU2Txq7xBTzGQMFmy/Pnjk83kP2cogxB2+tRyjITGqTwD8b
+        gg9PFCkCgYEA+7u8A0l0Cz6p0SI6c7ftVePVRiIhpawWN7og/wEmI6zUjm/3rA+R
+        hrhaVKuOD8QF/HdDsqTck5gjGAjTmJz6r33/cl1Tz+pr62znsrB4r0yMKvQbKN81
+        WGaWOsi2+ZXqLNv5h5wpUF0MTKlXHeKnwP5kuEvGwVn6WURFCh6PhLMCgYEA8i5e
+        JjulJVGyd5HuoY3xyO7E6DjidsqRnVRq+hYpORjnHvTmSwe4+tH4ha2p9Kv2Y6k3
+        C1NYY/fSMQoYCCRaYyJleI+la/9tsZqAmtms4ZB8KhFmPHf9fW75i6G0xKWyZ8K+
+        E2Ft/UaEiM282593cguV6+Kt5uExnyPxLLK4FlUCgYEAwRJ/JGI8/7bjFkTTYheq
+        j5q75BufhOrU6471acAe2XPgXxLfefdC3Xodxh0CS3NESBvNL4Ikr4sbN37lk4Kq
+        /th7iOKtuqUIeru/hZy2I3VpeDRbdGCmEJQ2GwYA2LKztg5Nd0Y9paaIHXAwIfrK
+        QUqcQ4HTAk8ZpUeoUBeaaeMCgYANLmbjb9WiPVsYVPIHCwHA7PX8qbPxwT7BsGmO
+        KQyfVfKmZa/vH4F67Vi4deZNMdrcO8aKMEQcVM2065a5QrlEsgeR00eupB1lUEJ1
+        qylUsZeAdqf43JMIc7TTW77KATa/nQLZbTEeWus1wvTngztuEqFbUGAks9cOkVc8
+        FpIcbQKBgQDVIL8gPLmn0f+4oLF8MBC+oxtKpz14X5iJ1saGFkzW5I+nIEskpS0S
+        qtirnTCnJFGdCrFwctnxiuiCmyGwpBYdjIfHyvYAHnqAtMnESzCUyeSFZiquVW5W
+        MvbMmDPoV27XOHU9kIq6NXtfrkpufiyo6/VEYWozXalxKLNuqLYfPQ==
+        -----END RSA PRIVATE KEY-----
+      oauth:
+        id: Iv1.bf2c2c45b449bfd9
+        secret: ef694cd6e45223075d78d138ef014049052665f1
+        teams:

data/test/dummy/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_10_08_152744) do
+ActiveRecord::Schema.define(version: 2021_05_04_200438) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
@@ -33,6 +33,7 @@ ActiveRecord::Schema.define(version: 2020_10_08_152744) do
     t.string "html_url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "github_updated_at"
     t.index ["commit_id"], name: "index_check_runs_on_commit_id"
     t.index ["github_id", "commit_id"], name: "index_check_runs_on_github_id_and_commit_id", unique: true
     t.index ["stack_id"], name: "index_check_runs_on_stack_id"
@@ -234,7 +235,7 @@ ActiveRecord::Schema.define(version: 2020_10_08_152744) do
     t.string "environment", limit: 50, default: "production", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string "branch", limit: 255, default: "master", null: false
+    t.string "branch", limit: 255, null: false
     t.string "deploy_url", limit: 255
     t.string "lock_reason", limit: 4096
     t.integer "tasks_count", limit: 4, default: 0, null: false

data/test/dummy/db/seeds.rb

@@ -31,6 +31,7 @@ module Shipit
         name:  Faker::Internet.domain_name.parameterize,
         owner: Faker::Company.name.parameterize
       ),
+      branch: "main",
       deploy_url:  "https://#{Faker::Internet.domain_name.parameterize}.#{Faker::Internet.domain_suffix}/",
       cached_deploy_spec: DeploySpec.load(%(
         {

data/test/fixtures/payloads/check_suite_master.json

@@ -67,24 +67,7 @@
     "name": "shipit-engine",
     "full_name": "Shopify/shipit-engine",
     "owner": {
-      "login": "github",
-      "id": 340,
-      "node_id": "MDQ6VXNlcjIxMDMxMDY3",
-      "avatar_url": "http://alambic.github.com/avatars/u/340?",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/github",
-      "html_url": "http://github.com/github",
-      "followers_url": "https://api.github.com/users/github/followers",
-      "following_url": "https://api.github.com/users/github/following{/other_user}",
-      "gists_url": "https://api.github.com/users/github/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/github/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/github/subscriptions",
-      "organizations_url": "https://api.github.com/users/github/orgs",
-      "repos_url": "https://api.github.com/users/github/repos",
-      "events_url": "https://api.github.com/users/github/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/github/received_events",
-      "type": "Organization",
-      "site_admin": false
+      "login": "Shopify"
     },
     "private": false,
     "html_url": "http://github.com/Shopify/shipit-engine",
@@ -155,18 +138,7 @@
     "default_branch": "master"
   },
   "organization": {
-    "login": "github",
-    "id": 340,
-    "node_id": "MDEyOk9yZ2FuaXphdGlvbjM4MzAyODk5",
-    "url": "https://api.github.com/orgs/github",
-    "repos_url": "https://api.github.com/orgs/github/repos",
-    "events_url": "https://api.github.com/orgs/github/events",
-    "hooks_url": "https://api.github.com/orgs/github/hooks",
-    "issues_url": "https://api.github.com/orgs/github/issues",
-    "members_url": "https://api.github.com/orgs/github/members{/member}",
-    "public_members_url": "https://api.github.com/orgs/github/public_members{/member}",
-    "avatar_url": "http://alambic.github.com/avatars/u/340?",
-    "description": "How people build software."
+    "login": "Shopify"
   },
   "sender": {
     "login": "octocat",

data/test/fixtures/payloads/push_master.json

@@ -64,7 +64,7 @@
     "fork": false,
     "size": 0,
     "owner": {
-      "name": "Shopify",
+      "login": "Shopify",
       "email": "jean.boussier@gmail.com"
     },
     "private": false,

data/test/fixtures/payloads/push_not_master.json

@@ -64,7 +64,7 @@
     "fork": false,
     "size": 0,
     "owner": {
-      "name": "Shopify",
+      "login": "Shopify",
       "email": "jean.boussier@gmail.com"
     },
     "private": false,

data/test/fixtures/shipit/commits.yml

@@ -45,8 +45,8 @@ fourth:
   sha: 467578b362bf2b4df5903e1c7960929361c3435a
   message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
   stack: shipit
-  author: walrus
-  committer: walrus
+  author: ~
+  committer: ~
   authored_at: <%= 4.days.ago.to_s(:db) %>
   committed_at: <%= 3.days.ago.to_s(:db) %>
   additions: 420

data/test/fixtures/shipit/hooks.yml

@@ -3,6 +3,7 @@ shipit_deploys:
   events: 'deploy,rollback'
   delivery_url: https://example.com/events/deploy
   content_type: json
+  secret: 'example-secret-key'
 
 all_deploys:
   events: 'deploy,rollback'

data/test/fixtures/shipit/tasks.yml

@@ -29,7 +29,7 @@ shipit2:
 
 shipit_restart:
   id: 3
-  user: walrus
+  user: ~
   type: Shipit::Task
   stack: shipit
   status: success

data/test/helpers/json_helper.rb

@@ -3,7 +3,11 @@ module JSONHelper
   UNDEFINED = Object.new.freeze
   private_constant :UNDEFINED
 
-  def assert_json(path = nil, expected_value = UNDEFINED, document: response.body)
+  def assert_json(path = nil, expected_value = UNDEFINED, &block)
+    assert_json_document(response.body, path, expected_value, &block)
+  end
+
+  def assert_json_document(document, path, expected_value = UNDEFINED)
     value = follow_path(path.to_s.split('.'), document: document)
     if block_given?
       yield value

data/test/jobs/github_sync_job_test.rb

@@ -91,7 +91,7 @@ module Shipit
       last = stub(sha: 123)
       first = stub(sha: 345)
       Shipit::FirstParentCommitsIterator.any_instance.stubs(:each).multiple_yields(last, first)
-      @job.stubs(lookup_commit: nil)
+      @job.stubs(lookup_commit: nil, stack: @stack)
 
       commits, parent = @job.fetch_missing_commits { stub }
       assert_nil parent
@@ -104,6 +104,7 @@ module Shipit
       Shipit::FirstParentCommitsIterator.any_instance.stubs(:each).multiple_yields(last, first)
       @job.stubs(:lookup_commit).with(123).returns(nil)
       @job.stubs(:lookup_commit).with(345).returns(first)
+      @job.stubs(stack: @stack)
 
       commits, parent = @job.fetch_missing_commits { stub }
       assert_equal first, parent

data/test/models/commit_deployment_status_test.rb

@@ -12,7 +12,7 @@ module Shipit
 
     test 'creation on GitHub' do
       response = stub(id: 44, url: 'https://example.com')
-      @author.github_api.expects(:create_deployment_status).with(
+      @author.github_api.class.any_instance.expects(:create_deployment_status).with(
         @deployment.api_url,
         'in_progress',
         accept: "application/vnd.github.flash-preview+json",
@@ -33,7 +33,7 @@ module Shipit
       status = deployment.statuses.create!(status: 'success')
       status.stubs(:description).returns('desc' * limit)
       create_status_response = stub(id: 'abcd', url: 'https://github.com/status/abcd')
-      status.author.github_api.expects(:create_deployment_status).with do |*_args, **kwargs|
+      status.author.github_api.class.any_instance.expects(:create_deployment_status).with do |_url, _status, kwargs|
         kwargs[:description].size <= limit
       end.returns(create_status_response)
 
@@ -47,7 +47,7 @@ module Shipit
       stack = status.stack
       stack.deploy_url = "stack-deploy-url"
       create_status_response = stub(id: 'abcd', url: 'https://github.com/status/abcd')
-      status.author.github_api.expects(:create_deployment_status).with do |*_args, **kwargs|
+      status.author.github_api.class.any_instance.expects(:create_deployment_status).with do |_url, _status, kwargs|
         kwargs[:environment_url] == 'stack-deploy-url'
       end.returns(create_status_response)
 

data/test/models/commits_test.rb

@@ -350,6 +350,8 @@ module Shipit
         output: mock(
           title: 'Tests build ran successfully',
         ),
+        completed_at: Time.now,
+        started_at: Time.now - 1.minute,
       )
       response = mock(
         check_runs: [check_run],

data/test/models/deploy_spec_test.rb

@@ -828,6 +828,13 @@ module Shipit
       @spec.stubs(:lerna?).returns(true)
       @spec.stubs(:lerna_config).returns('lerna' => '2.0.0', 'version' => 'independent')
       assert_equal 'assert-lerna-independent-version-tags', @spec.deploy_steps[0]
+      assert_equal 'publish-lerna-independent-packages-legacy', @spec.deploy_steps[1]
+    end
+
+    test '#publish_lerna_packages checks if independent version tags exist, checks if a newer version of lerna is used, and then invokes lerna deploy script' do
+      @spec.stubs(:lerna?).returns(true)
+      @spec.stubs(:lerna_config).returns('lerna' => '3.0.0', 'version' => 'independent')
+      assert_equal 'assert-lerna-independent-version-tags', @spec.deploy_steps[0]
       assert_equal 'publish-lerna-independent-packages', @spec.deploy_steps[1]
     end
 

data/test/models/deploys_test.rb

@@ -802,6 +802,12 @@ module Shipit
       assert_equal @user, @stack.lock_author
     end
 
+    test "#trigger_rollback does not lock the stack if not requested" do
+      refute @stack.locked?
+      @deploy.trigger_rollback(@user, lock: false)
+      refute @stack.reload.locked?
+    end
+
     test "#trigger_rollback marks the rollback as `ignored_safeties` if the force option was used" do
       rollback = @deploy.trigger_rollback(@user, force: true)
       assert_predicate rollback, :ignored_safeties?
@@ -967,6 +973,18 @@ module Shipit
       end
     end
 
+    test "succeeding a deploy sets the release status as pending and does not schedule job if the status delay is negative (-1)" do
+      @deploy = shipit_deploys(:canaries_running)
+      @deploy.stack.expects(:release_status_delay).at_least_once.returns(Duration.parse(-1))
+
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_not_equal 'success', @deploy.last_release_status.state
+        @deploy.report_complete!
+        assert_equal 'validating', @deploy.status
+        assert_equal 'pending', @deploy.last_release_status.state
+      end
+    end
+
     test "triggering a rollback via abort! sets the release status as failure" do
       @deploy = shipit_deploys(:canaries_running)
       @deploy.ping

data/test/models/hook_test.rb

@@ -36,6 +36,35 @@ module Shipit
       end
     end
 
+    test ".deliver! sends request with correct method, headers, and body" do
+      stub_request(:post, @hook.delivery_url).to_return(body: 'OK')
+      body = { 'foo' => 42 }
+      expected_body = JSON.pretty_generate(body)
+      expected_signature = Hook::DeliverySigner.new(@hook.secret).sign(expected_body)
+
+      perform_enqueued_jobs(only: DeliverHookJob) do
+        @hook.deliver!(:deploy, body)
+      end
+      assert_performed_jobs 1
+      assert_requested :post, @hook.delivery_url do |req|
+        req.headers['X-Shipit-Signature'] == expected_signature
+      end
+    end
+
+    test ".deliver! sends without signature if no secret is configured" do
+      stub_request(:post, @hook.delivery_url).to_return(body: 'OK')
+      @hook.update!(secret: '')
+      body = { 'foo' => 42 }
+
+      perform_enqueued_jobs(only: DeliverHookJob) do
+        @hook.deliver!(:deploy, body)
+      end
+      assert_performed_jobs 1
+      assert_requested :post, @hook.delivery_url do |req|
+        !req.headers.key?('X-Shipit-Signature')
+      end
+    end
+
     test ".scoped? returns true if the hook has a stack_id" do
       @hook.stack_id = nil
       refute @hook.scoped?
@@ -73,7 +102,7 @@ module Shipit
       locked_stack = Stack.first
       locked_stack.lock("Some Reason", nil)
       serialized = Hook.coerce_payload(stack: locked_stack)
-      assert_json("stack.lock_author.anonymous", true, document: serialized)
+      assert_json_document(serialized, "stack.lock_author.anonymous", true)
     end
   end
 end

data/test/models/merge_request_test.rb

@@ -60,7 +60,7 @@ module Shipit
 
       assert_nil MergeRequest.extract_number(@stack, 'https://github.com/ACME/shipit-engine/pull/42')
 
-      Shipit.github.expects(:domain).returns('github.acme.com').at_least_once
+      Shipit.github.class.any_instance.expects(:domain).returns('github.acme.com').at_least_once
       assert_equal 42, MergeRequest.extract_number(@stack, 'https://github.acme.com/Shopify/shipit-engine/pull/42')
       assert_nil MergeRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
     end
@@ -125,6 +125,21 @@ module Shipit
         created_at: 1.day.ago,
       )])
 
+      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, head_sha).returns(stub(
+        check_runs: [stub(
+          id: 123456,
+          name: 'check run',
+          conclusion: 'success',
+          output: stub(
+            title: 'a test checkrun',
+          ),
+          details_url: 'http://example.com',
+          html_url: 'http://example.com',
+          completed_at: Time.now,
+          started_at: 1.minute.ago,
+        )]
+      ))
+
       merge_request.refresh!
 
       assert_predicate merge_request, :mergeable?
@@ -233,9 +248,9 @@ module Shipit
       end
       params = job.arguments.first
       assert_equal 'merge', params[:event]
-      assert_json 'status', 'rejected', document: params[:payload]
-      assert_json 'merge_request.rejection_reason', 'merge_conflict', document: params[:payload]
-      assert_json 'merge_request.number', @pr.number, document: params[:payload]
+      assert_json_document params[:payload], 'status', 'rejected'
+      assert_json_document params[:payload], 'merge_request.rejection_reason', 'merge_conflict'
+      assert_json_document params[:payload], 'merge_request.number', @pr.number
     end
 
     test "#merge! doesnt delete the branch if there are open PRs against it" do