Flatten depndency-group-name in existing-group-pull-requests

sungam3r · May 2, 2023 · 0d9cc45 · 0d9cc45
1 parent 05fcae5
commit 0d9cc45
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/updater/lib/dependabot/dependency_change.rb b/updater/lib/dependabot/dependency_change.rb
@@ -73,7 +73,7 @@ def existing_pull_request
       if grouped_update?
         # We only want PRs for the same group that have the same versions
         job.existing_group_pull_requests.find do |pr|
-          pr["dependency-group"]["name"] == dependency_group.name &&
+          pr["dependency-group-name"] == dependency_group.name &&
             Set.new(pr["dependencies"]) == updated_dependencies_set
         end
       else

diff --git a/updater/lib/dependabot/job.rb b/updater/lib/dependabot/job.rb
@@ -91,7 +91,7 @@ def initialize(attributes)
       #
       # We will need to do a pass updating the CLI and smoke tests before this is possible,
       # so let's consider it optional for now.
-      @existing_group_pull_requests = attributes.fetch(:existing_group_pull_requests, [])
+      @existing_group_pull_requests   = attributes.fetch(:existing_group_pull_requests, [])
       @experiments                    = attributes.fetch(:experiments, {})
       @ignore_conditions              = attributes.fetch(:ignore_conditions)
       @lockfile_only                  = attributes.fetch(:lockfile_only)

diff --git a/updater/spec/fixtures/job_definitions/bundler/version_updates/group_update_refresh.yaml b/updater/spec/fixtures/job_definitions/bundler/version_updates/group_update_refresh.yaml
@@ -11,8 +11,7 @@ job:
   - dummy-pkg-b
   existing-pull-requests: []
   existing-group-pull-requests:
-  - dependency-group:
-      name: everything-everywhere-all-at-once
+  - dependency-group-name: everything-everywhere-all-at-once
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.2.0

diff --git a/...es/job_definitions/bundler/version_updates/group_update_refresh_dependencies_changed.yaml b/...es/job_definitions/bundler/version_updates/group_update_refresh_dependencies_changed.yaml
@@ -12,8 +12,7 @@ job:
   - dummy-pkg-c
   existing-pull-requests: []
   existing-group-pull-requests:
-  - dependency-group:
-      name: everything-everywhere-all-at-once
+  - dependency-group-name: everything-everywhere-all-at-once
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.2.0

diff --git a/.../fixtures/job_definitions/bundler/version_updates/group_update_refresh_missing_group.yaml b/.../fixtures/job_definitions/bundler/version_updates/group_update_refresh_missing_group.yaml
@@ -11,8 +11,7 @@ job:
   - dummy-pkg-b
   existing-pull-requests: []
   existing-group-pull-requests:
-  - dependency-group:
-      name: everything-everywhere-all-at-once
+  - dependency-group-name: everything-everywhere-all-at-once
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.2.0

diff --git a/...pec/fixtures/job_definitions/bundler/version_updates/group_update_refresh_similar_pr.yaml b/...pec/fixtures/job_definitions/bundler/version_updates/group_update_refresh_similar_pr.yaml
@@ -11,13 +11,11 @@ job:
   - dummy-pkg-b
   existing-pull-requests: []
   existing-group-pull-requests:
-  - dependency-group:
-      name: everything-everywhere-all-at-once
+  - dependency-group-name: everything-everywhere-all-at-once
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.1.5
-  - dependency-group:
-      name: overlapping-group
+  - dependency-group-name: overlapping-group
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.2.0

diff --git a/...ec/fixtures/job_definitions/bundler/version_updates/group_update_refresh_stale_group.yaml b/...ec/fixtures/job_definitions/bundler/version_updates/group_update_refresh_stale_group.yaml
@@ -11,8 +11,7 @@ job:
   - dummy-pkg-b
   existing-pull-requests: []
   existing-group-pull-requests:
-  - dependency-group:
-      name: everything-everywhere-all-at-once
+  - dependency-group-name: everything-everywhere-all-at-once
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.2.0

diff --git a/...xtures/job_definitions/bundler/version_updates/group_update_refresh_versions_changed.yaml b/...xtures/job_definitions/bundler/version_updates/group_update_refresh_versions_changed.yaml
@@ -11,8 +11,7 @@ job:
   - dummy-pkg-b
   existing-pull-requests: []
   existing-group-pull-requests:
-  - dependency-group:
-      name: everything-everywhere-all-at-once
+  - dependency-group-name: everything-everywhere-all-at-once
     dependencies:
     - dependency-name: dummy-pkg-b
       dependency-version: 1.1.5