shipit-engine 0.32.0 → 0.33.0

data/test/fixtures/shipit/statuses.yml

@@ -134,3 +134,12 @@ canaries_fifth_success:
   created_at: <%= 7.days.ago.to_s(:db) %>
   state: success
   target_url: "http://www.example.com"
+
+review_stack_commit_success:
+  stack: review_stack
+  commit_id: 801
+  description: lets go
+  context: ci/travis
+  created_at: <%= 10.days.ago.to_s(:db) %>
+  state: success
+  target_url: "http://www.example.com"

data/test/fixtures/shipit/tasks.yml

@@ -11,6 +11,7 @@ shipit:
   created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
   started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
   ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
+  max_retries: 3
 
 shipit2:
   id: 2
@@ -60,6 +61,8 @@ shipit_pending:
   deletions: 406
   created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
   allow_concurrency: true
+  max_retries: 1
+  retry_attempt: 0
 
 shipit_running:
   id: 5

data/test/fixtures/shipit/users.yml

@@ -5,6 +5,13 @@ walrus:
   encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
   encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
 
+codertocat:
+  name: Coding Cat
+  email: coding@cat.com
+  login: Codertocat
+  encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
+  encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
+
 bob:
   name:  Bob the Builder
   email: bob@bob.com

data/test/helpers/payloads_helper.rb

@@ -3,4 +3,8 @@ module PayloadsHelper
   def payload(name)
     Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json").read
   end
+
+  def payload_parsed(name)
+    JSON.parse(payload(name))
+  end
 end

data/test/jobs/chunk_rollup_job_test.rb

@@ -5,6 +5,7 @@ module Shipit
   class ChunkRollupJobTest < ActiveSupport::TestCase
     setup do
       @task = shipit_tasks(:shipit)
+      @task.write("dummy output")
       @job = ChunkRollupJob.new
     end
 
@@ -15,10 +16,10 @@ module Shipit
       @job.perform(@task)
 
       @task.reload
-      assert_equal 0, @task.chunks.count
       assert @task.output.present?
       assert_equal expected_output, @task.chunk_output
       assert @task.rolled_up
+      assert_nil Shipit.redis.get(@task.send(:output_key))
     end
 
     test "#peform ignores non-finished jobs" do
@@ -40,5 +41,18 @@ module Shipit
 
       @job.perform(@task)
     end
+
+    test "#perform takes into account data still in the DB" do
+      output_chunks = Shipit::OutputChunk.create(text: "DB output", task: @task)
+      expected_output = [output_chunks.text, @task.chunk_output].join("\n")
+
+      @job.perform(@task)
+
+      @task.reload
+      assert_equal expected_output, @task.chunk_output
+      assert @task.rolled_up
+      assert_empty Shipit::OutputChunk.where(task: @task)
+      assert_nil Shipit.redis.get(@task.send(:output_key))
+    end
   end
 end

data/test/jobs/destroy_repository_job_test.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+module Shipit
+  class DestroyRepositoryJobTest < ActiveSupport::TestCase
+    setup do
+      @job = DestroyRepositoryJob.new
+      @repository = Repository.first
+    end
+
+    test "perform destroys the repository" do
+      assert_difference -> { Repository.count }, -1 do
+        @job.perform(@repository)
+      end
+    end
+
+    test "perform destroys the repository's stacks" do
+      stack = Stack.first
+      Shipit.github.api.expects(:remove_hook).times(stack.github_hooks.count)
+      @repository.stacks << stack
+
+      assert_difference -> { Stack.count }, -@repository.stacks.size do
+        @job.perform(@repository)
+      end
+    end
+  end
+end

data/test/jobs/perform_task_job_test.rb

@@ -19,8 +19,8 @@ module Shipit
     end
 
     test "#perform fetch commits from the API" do
-      @job.stubs(:capture!)
-      @job.stubs(:capture)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture)
       @commands = stub
       Commands.expects(:for).with(@deploy).returns(@commands)
 
@@ -39,7 +39,7 @@ module Shipit
       @deploy.stack.expects(:release_status?).at_least_once.returns(false)
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_enqueued_with(job: FetchDeployedRevisionJob, args: [@deploy.stack]) do
         @job.perform(@deploy)
@@ -50,7 +50,7 @@ module Shipit
       @deploy.stack.expects(:release_status?).at_least_once.returns(false)
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
@@ -63,7 +63,7 @@ module Shipit
 
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
@@ -77,7 +77,7 @@ module Shipit
 
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture!)
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!)
 
       assert_equal 'pending', @deploy.status
       @job.perform(@deploy)
@@ -85,7 +85,7 @@ module Shipit
     end
 
     test "marks deploy as `error` if any application error is raised" do
-      @job.expects(:capture!).raises("some error")
+      Shipit::TaskExecutionStrategy::Default.any_instance.expects(:capture!).raises("some error")
       assert_nothing_raised do
         @job.perform(@deploy)
       end
@@ -94,7 +94,7 @@ module Shipit
     end
 
     test "marks deploy as `failed` if a command exit with an error code" do
-      @job.expects(:capture!).at_least_once.raises(Command::Error.new('something'))
+      Shipit::TaskExecutionStrategy::Default.any_instance.expects(:capture!).at_least_once.raises(Command::Error.new('something'))
       @job.perform(@deploy)
       assert_equal 'failed', @deploy.reload.status
     end

data/test/jobs/{merge_pull_requests_job_test.rb → process_merge_requests_job_test.rb}

@@ -2,22 +2,22 @@
 require 'test_helper'
 
 module Shipit
-  class MergePullRequestsJobTest < ActiveSupport::TestCase
+  class ProcessMergeRequestsJobTest < ActiveSupport::TestCase
     setup do
       @stack = shipit_stacks(:shipit)
-      @job = MergePullRequestsJob.new
+      @job = ProcessMergeRequestsJob.new
 
-      @pending_pr = shipit_pull_requests(:shipit_pending)
-      @unmergeable_pr = shipit_pull_requests(:shipit_pending_unmergeable)
-      @not_ready_pr = shipit_pull_requests(:shipit_pending_not_mergeable_yet)
-      @closed_pr = shipit_pull_requests(:shipit_pending_closed)
-      @merged_pr = shipit_pull_requests(:shipit_pending_merged)
-      @expired_pr = shipit_pull_requests(:shipit_pending_expired)
-      @mergable_pending_ci = shipit_pull_requests(:shipit_mergeable_pending_ci)
+      @pending_pr = shipit_merge_requests(:shipit_pending)
+      @unmergeable_pr = shipit_merge_requests(:shipit_pending_unmergeable)
+      @not_ready_pr = shipit_merge_requests(:shipit_pending_not_mergeable_yet)
+      @closed_pr = shipit_merge_requests(:shipit_pending_closed)
+      @merged_pr = shipit_merge_requests(:shipit_pending_merged)
+      @expired_pr = shipit_merge_requests(:shipit_pending_expired)
+      @mergable_pending_ci = shipit_merge_requests(:shipit_mergeable_pending_ci)
     end
 
     test "#perform rejects unmergeable PRs and merge the others" do
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       stub_request(:put, "#{@pending_pr.api_url}/merge").to_return(status: %w(200 OK), body: {
         sha: "6dcb09b5b57875f334f61aebed695e2e4193db5e",
         merged: true,
@@ -35,7 +35,7 @@ module Shipit
     end
 
     test "#perform rejects PRs if the merge attempt fails" do
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       stub_request(:put, "#{@pending_pr.api_url}/merge").to_return(status: %w(405 Method not allowed), body: {
         message: "Pull Request is not mergeable",
         documentation_url: "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button",
@@ -47,24 +47,24 @@ module Shipit
     end
 
     test "#perform rejects PRs but do not attempt to merge any if the stack doesn't allow merges" do
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       @stack.update!(lock_reason: 'Maintenance')
       @job.perform(@stack)
       assert_predicate @pending_pr.reload, :pending?
     end
 
     test "#perform revalidate PRs but do not attempt to merge any if the stack doesn't allow merges" do
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       @stack.update!(lock_reason: 'Maintenance')
       @job.perform(@stack)
       assert_predicate @expired_pr.reload, :revalidating?
     end
 
     test "#perform schedules a new job if the first PR in the queue is not mergeable yet" do
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
 
       @pending_pr.update!(mergeable: nil)
-      assert_enqueued_with(job: MergePullRequestsJob) do
+      assert_enqueued_with(job: ProcessMergeRequestsJob) do
         @job.perform(@stack)
       end
       assert_predicate @pending_pr.reload, :pending?
@@ -72,21 +72,21 @@ module Shipit
 
     test "#perform cancels merge requests for closed PRs" do
       @pending_pr.cancel!
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       @job.perform(@stack)
       assert_predicate @closed_pr.reload, :canceled?
     end
 
     test "#perform cancels merge requests for manually merged PRs" do
       @pending_pr.cancel!
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       @job.perform(@stack)
       assert_predicate @merged_pr.reload, :canceled?
     end
 
     test "#perform does not reject pull requests with pending statuses" do
       @pending_pr.cancel!
-      PullRequest.any_instance.stubs(:refresh!)
+      MergeRequest.any_instance.stubs(:refresh!)
       @job.perform(@stack)
       refute_predicate @mergable_pending_ci.reload, :rejected?
       refute_predicate @mergable_pending_ci.reload, :merged?

data/test/lib/shipit/deploy_commands_test.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class DeployCommandsTest < ActiveSupport::TestCase
+  test "#env includes the stack's pull request labels" do
+    stack = shipit_stacks(:review_stack)
+    deploy = stack.trigger_continuous_delivery
+    stack.pull_request.labels = ["wip", "bug"]
+
+    env = Shipit::DeployCommands.new(deploy).env
+
+    assert_equal env["WIP"], "true"
+    assert_equal env["BUG"], "true"
+  end
+end

data/test/lib/shipit/task_commands_test.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class TaskCommandsTest < ActiveSupport::TestCase
+  test "#env includes a ReviewStack's pull request labels" do
+    stack = shipit_stacks(:review_stack)
+    stack.pull_request.labels = ["wip", "bug"]
+    task = shipit_tasks(:shipit_restart)
+    task.stack = stack
+
+    env = Shipit::TaskCommands.new(task).env
+
+    assert_equal env["WIP"], "true"
+    assert_equal env["BUG"], "true"
+  end
+end

data/test/models/commits_test.rb

@@ -170,6 +170,15 @@ module Shipit
       assert_equal limit, @commit.message.bytesize
     end
 
+    test "#message= truncates multibyte messages" do
+      skip unless Shipit::Commit.columns_hash['message'].limit
+      limit = Shipit::Commit.columns_hash['message'].limit
+
+      @commit.update!(message: '国' * limit)
+      assert_operator @commit.message.length, :<=, limit
+      assert_operator @commit.message.bytesize, :<=, limit
+    end
+
     test "#pull_request? detect pull request based on message format" do
       assert @pr.pull_request?
       refute @commit.pull_request?
@@ -678,7 +687,7 @@ module Shipit
       end
     end
 
-    test "#add_status schedule a MergePullRequests job if the commit transition to `pending` or `success`" do
+    test "#add_status schedule a MergeMergeRequests job if the commit transition to `pending` or `success`" do
       commit = shipit_commits(:second)
       github_status = OpenStruct.new(
         state: 'success',
@@ -688,7 +697,7 @@ module Shipit
       )
 
       assert_equal 'failure', commit.state
-      assert_enqueued_with(job: MergePullRequestsJob, args: [@commit.stack]) do
+      assert_enqueued_with(job: ProcessMergeRequestsJob, args: [@commit.stack]) do
         commit.create_status_from_github!(github_status)
         assert_equal 'success', commit.state
       end
@@ -729,12 +738,12 @@ module Shipit
         sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
         message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!",
       )
-      pull_request = shipit_pull_requests(:shipit_pending)
+      merge_request = shipit_merge_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
+      assert_equal merge_request.title, commit.pull_request_title
+      assert_equal merge_request, commit.merge_request
     end
 
     test "merge commits infer pull request number and title from the message if it's not a known pull request" do
@@ -750,7 +759,7 @@ module Shipit
       assert_predicate commit, :pull_request?
       assert_equal 99, commit.pull_request_number
       assert_equal 'yoloshipit!', commit.pull_request_title
-      assert_nil commit.pull_request
+      assert_nil commit.merge_request
     end
 
     test "the merge requester if known overrides the commit author" do
@@ -779,7 +788,7 @@ module Shipit
       refute_predicate commit, :pull_request?
       assert_nil commit.pull_request_number
       assert_nil commit.pull_request_title
-      assert_nil commit.pull_request
+      assert_nil commit.merge_request
     end
 
     test "#revert? returns false if the message doesn't follow the revert convention" do
@@ -838,12 +847,12 @@ module Shipit
     test "when merged via the queue, deploy_requested_at is merge_requested_at" do
       commit = shipit_commits(:cyclimse_merged)
       assert_predicate commit, :pull_request?
-      assert_equal commit.pull_request, shipit_pull_requests(:cyclimse_pending_merged)
-      assert_equal commit.deploy_requested_at, commit.pull_request.merge_requested_at
+      assert_equal commit.merge_request, shipit_merge_requests(:cyclimse_pending_merged)
+      assert_equal commit.deploy_requested_at, commit.merge_request.merge_requested_at
     end
 
     test "when merged manually after being queued, deploy_requested_at is created_at" do
-      pr = shipit_pull_requests(:cyclimse_pending_merged)
+      pr = shipit_merge_requests(:cyclimse_pending_merged)
       pr.cancel!
       commit = shipit_commits(:cyclimse_merged)
       assert_equal commit.deploy_requested_at, commit.created_at
@@ -870,9 +879,9 @@ module Shipit
 
     def expect_hook_emit(commit, event, status_attributes, &block)
       matches = lambda do |payload|
-        assert_equal commit, payload[:commit]
-        assert_equal commit.stack, payload[:stack]
-        assert_equal status_attributes[:state], payload[:status]
+        assert_equal(commit, payload[:commit])
+        assert_equal(commit.stack, payload[:stack])
+        assert_equal(status_attributes[:state], payload[:status])
       end
       expect_hook(event, commit.stack, matches, &block)
     end

data/test/models/deploy_spec_test.rb

@@ -106,6 +106,12 @@ module Shipit
       refute @spec.bundle_install.last.include?('--frozen')
     end
 
+    test "#provisioning_handler returns `provision.handler` if present" do
+      @spec.stubs(:load_config).returns('provision' => { 'handler_name' => 'ExpectedProvisioningHandler' })
+
+      assert_equal "ExpectedProvisioningHandler", @spec.provisioning_handler_name
+    end
+
     test '#deploy_steps returns `deploy.override` if present' do
       @spec.stubs(:load_config).returns('deploy' => { 'override' => %w(foo bar baz) })
       assert_equal %w(foo bar baz), @spec.deploy_steps
@@ -175,11 +181,31 @@ module Shipit
       end
     end
 
+    test '#retries_on_deploy returns `deploy.retries` if present' do
+      @spec.stubs(:load_config).returns('deploy' => { 'retries' => 5 })
+      assert_equal 5, @spec.retries_on_deploy
+    end
+
+    test '#retries_on_deploy returns a default value if `deploy.retries` is not present' do
+      @spec.stubs(:load_config).returns('deploy' => {})
+      assert_nil @spec.retries_on_deploy
+    end
+
     test '#rollback_steps returns `rollback.override` if present' do
       @spec.stubs(:load_config).returns('rollback' => { 'override' => %w(foo bar baz) })
       assert_equal %w(foo bar baz), @spec.rollback_steps
     end
 
+    test '#retries_on_rollback returns `rollback.retries` if present' do
+      @spec.stubs(:load_config).returns('rollback' => { 'retries' => 5 })
+      assert_equal 5, @spec.retries_on_rollback
+    end
+
+    test '#retries_on_rollback returns a default value if `rollback.retries` is not present' do
+      @spec.stubs(:load_config).returns('rollback' => {})
+      assert_nil @spec.retries_on_rollback
+    end
+
     test '#rollback_steps returns `cap $ENVIRONMENT deploy:rollback` if a `Capfile` is present' do
       @spec.expects(:bundler?).returns(true).at_least_once
       @spec.expects(:capistrano?).returns(true)
@@ -364,13 +390,20 @@ module Shipit
         },
         'dependencies' => { 'override' => [] },
         'plugins' => {},
+        'provision' => {
+          'handler_name' => nil,
+        },
         'deploy' => {
           'override' => nil,
           'variables' => [],
           'max_commits' => 8,
           'interval' => 0,
+          'retries' => nil,
+        },
+        'rollback' => {
+          'override' => nil,
+          'retries' => nil,
         },
-        'rollback' => { 'override' => nil },
         'fetch' => nil,
         'tasks' => {},
       }
@@ -559,40 +592,40 @@ module Shipit
       assert_equal %w(ci/circleci soc/compliance), @spec.required_statuses
     end
 
-    test "pull_request_merge_method defaults to `nil`" do
+    test "merge_request_merge_method defaults to `nil`" do
       @spec.expects(:load_config).returns({})
-      assert_nil @spec.pull_request_merge_method
+      assert_nil @spec.merge_request_merge_method
     end
 
-    test "pull_request_merge_method returns `merge.method`" do
+    test "merge_request_merge_method returns `merge.method`" do
       @spec.expects(:load_config).returns(
         'merge' => {
           'method' => 'squash',
         },
       )
-      assert_equal 'squash', @spec.pull_request_merge_method
+      assert_equal 'squash', @spec.merge_request_merge_method
     end
 
-    test "pull_request_merge_method returns `nil` if `merge.method` is invalid" do
+    test "merge_request_merge_method returns `nil` if `merge.method` is invalid" do
       @spec.expects(:load_config).returns(
         'merge' => {
           'method' => 'squashing',
         },
       )
-      assert_nil @spec.pull_request_merge_method
+      assert_nil @spec.merge_request_merge_method
     end
 
-    test "pull_request_ignored_statuses defaults to the union of ci.hide and ci.allow_failures" do
+    test "merge_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
+      assert_equal %w(ci/circleci ci/jenkins ci/travis).sort, @spec.merge_request_ignored_statuses.sort
     end
 
-    test "pull_request_ignored_statuses defaults to empty if `merge.require` is present" do
+    test "merge_request_ignored_statuses defaults to empty if `merge.require` is present" do
       @spec.expects(:load_config).returns(
         'merge' => {
           'require' => 'bar',
@@ -602,10 +635,10 @@ module Shipit
           'allow_failures' => %w(ci/circleci ci/travis),
         },
       )
-      assert_equal [], @spec.pull_request_ignored_statuses
+      assert_equal [], @spec.merge_request_ignored_statuses
     end
 
-    test "pull_request_ignored_statuses returns `merge.ignore` if present" do
+    test "merge_request_ignored_statuses returns `merge.ignore` if present" do
       @spec.expects(:load_config).returns(
         'merge' => {
           'ignore' => 'bar',
@@ -615,19 +648,19 @@ module Shipit
           'allow_failures' => %w(ci/circleci ci/travis),
         },
       )
-      assert_equal ['bar'], @spec.pull_request_ignored_statuses
+      assert_equal ['bar'], @spec.merge_request_ignored_statuses
     end
 
-    test "pull_request_required_statuses defaults to ci.require" do
+    test "merge_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
+      assert_equal %w(ci/circleci ci/jenkins), @spec.merge_request_required_statuses
     end
 
-    test "pull_request_required_statuses defaults to empty if `merge.ignore` is present" do
+    test "merge_request_required_statuses defaults to empty if `merge.ignore` is present" do
       @spec.expects(:load_config).returns(
         'merge' => {
           'ignore' => 'bar',
@@ -636,10 +669,10 @@ module Shipit
           'require' => %w(ci/circleci ci/jenkins),
         },
       )
-      assert_equal [], @spec.pull_request_required_statuses
+      assert_equal [], @spec.merge_request_required_statuses
     end
 
-    test "pull_request_required_statuses returns `merge.require` if present" do
+    test "merge_request_required_statuses returns `merge.require` if present" do
       @spec.expects(:load_config).returns(
         'merge' => {
           'require' => 'bar',
@@ -649,21 +682,21 @@ module Shipit
           'allow_failures' => %w(ci/circleci ci/travis),
         },
       )
-      assert_equal ['bar'], @spec.pull_request_required_statuses
+      assert_equal ['bar'], @spec.merge_request_required_statuses
     end
 
-    test "revalidate_pull_requests_after defaults to `nil" do
+    test "revalidate_merge_requests_after defaults to `nil" do
       @spec.expects(:load_config).returns({})
-      assert_nil @spec.revalidate_pull_requests_after
+      assert_nil @spec.revalidate_merge_requests_after
     end
 
-    test "revalidate_pull_requests_after defaults to `nil` if `merge.timeout` cannot be parsed" do
+    test "revalidate_merge_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
+      assert_nil @spec.revalidate_merge_requests_after
     end
 
     test "revalidate_after returns `merge.revalidate_after` if present" do
@@ -672,7 +705,7 @@ module Shipit
           'revalidate_after' => '5m30s',
         },
       )
-      assert_equal 330, @spec.revalidate_pull_requests_after.to_i
+      assert_equal 330, @spec.revalidate_merge_requests_after.to_i
     end
 
     test "#file is impacted by `machine.directory`" do