diff --git a/common/lib/dependabot/errors.rb b/common/lib/dependabot/errors.rb index ae64fe75c4c..bd8ffc360c7 100644 --- a/common/lib/dependabot/errors.rb +++ b/common/lib/dependabot/errors.rb @@ -71,15 +71,6 @@ def initialize(source, msg = nil) end end - class PullRequestUpdateFailed < DependabotError - attr_reader :pull_request_id - - def initialize(pull_request_id, msg = nil) - @pull_request_id = pull_request_id - super(msg) - end - end - ##################### # File level errors # ##################### diff --git a/common/lib/dependabot/pull_request_updater/azure.rb b/common/lib/dependabot/pull_request_updater/azure.rb index cb0f6cfd03a..e6111d1ea9a 100644 --- a/common/lib/dependabot/pull_request_updater/azure.rb +++ b/common/lib/dependabot/pull_request_updater/azure.rb @@ -6,6 +6,8 @@ module Dependabot class PullRequestUpdater class Azure + class PullRequestUpdateFailed < Dependabot::DependabotError; end + OBJECT_ID_FOR_BRANCH_DELETE = "0000000000000000000000000000000000000000" attr_reader :source, :files, :base_commit, :old_commit, :credentials, @@ -59,10 +61,7 @@ def update_source_branch # 3) Delete temp branch update_branch(temp_branch_name, new_commit, OBJECT_ID_FOR_BRANCH_DELETE) - unless response.fetch("success", false) - raise Dependabot::PullRequestUpdateFailed.new(pull_request_number, - response.fetch("customMessage", nil)) - end + raise PullRequestUpdateFailed, response.fetch("customMessage", nil) unless response.fetch("success", false) end def pull_request diff --git a/common/spec/dependabot/pull_request_updater/azure_spec.rb b/common/spec/dependabot/pull_request_updater/azure_spec.rb index e1d95291852..fe5e62d5fe0 100644 --- a/common/spec/dependabot/pull_request_updater/azure_spec.rb +++ b/common/spec/dependabot/pull_request_updater/azure_spec.rb @@ -176,7 +176,7 @@ stub_request(:post, branch_update_url). to_return(status: 200, body: fixture("azure", "update_ref_failed.json")) - expect { updater.update }.to raise_error(Dependabot::PullRequestUpdateFailed) + expect { updater.update }.to raise_error(Dependabot::PullRequestUpdater::Azure::PullRequestUpdateFailed) end end end