Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions updater/lib/dependabot/pull_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,11 @@ def normalize_directory(directory)
sig { params(attributes: T::Hash[Symbol, T.untyped]).returns(T::Array[Dependabot::PullRequest]) }
def self.create_from_job_definition(attributes)
attributes.fetch(:existing_pull_requests).map do |pr|
case pr
when Array
pr_number = pr.first["pr-number"]
when Hash
pr_number = pr["pr-number"]
pr = pr["dependencies"] # now pr becomes the dependencies array from the pr
end
pr_number = pr["pr-number"]
deps = pr["dependencies"]

dependencies =
pr.map do |dep|
deps.map do |dep|
PullRequest::Dependency.new(
name: dep.fetch("dependency-name"),
version: dep.fetch("dependency-version", nil),
Expand Down
20 changes: 0 additions & 20 deletions updater/spec/dependabot/pull_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,6 @@
[[{ "dependency-name" => "foo", "dependency-version" => "1.0.0", "directory" => "/", "pr-number" => 123 }]]
end

it "can properly handle when each PR from the job is an array" do
pr2 = described_class.create_from_job_definition( # ← Fix: Correct method call
existing_pull_requests: existing_pull_requests
)
pr2 = pr2.first # get the first PR from the array

pr1 = described_class.new(
[
Dependabot::PullRequest::Dependency.new(
name: "foo",
version: "1.0.0",
directory: "/"
)
],
pr_number: 123
)
expect(pr2.pr_number).to eq(123)
expect(pr2).to eq(pr1)
end

it "can properly handle when each PR is a hash and dependencies object is present" do
existing_pull_requests =
[{ "pr-number" => 123,
Expand Down
Loading