Merge pull request #151 from dependabot/jakecoffman/fix-multidir-meta…

…data regenerate multidir tests
dependabot · Dec 4, 2023 · cfcb79e · cfcb79e
2 parents 62038ee + 3da5b0c
commit cfcb79e
Show file tree

Hide file tree

Showing 9 changed files with 127 additions and 93 deletions.
diff --git a/tests/smoke-bundler-group-multidir.yaml b/tests/smoke-bundler-group-multidir.yaml
@@ -243,9 +243,10 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the bundler at /bundler/multi-dir/foo security update group in /bundler/multi-dir/foo with 3 updates
+            pr-title: Bump the bundler group across 2 directories with 3 updates
             pr-body: |
-                Bumps the bundler at /bundler/multi-dir/foo security update group in /bundler/multi-dir/foo with 3 updates: [sinatra](https://github.com/sinatra/sinatra), [nokogiri](https://github.com/sparklemotion/nokogiri) and [rack](https://github.com/rack/rack).
+                Bumps the bundler group across 2 directories with 2 updates: [sinatra](https://github.com/sinatra/sinatra) and [nokogiri](https://github.com/sparklemotion/nokogiri).
+                Bumps the bundler group across 2 directories with 2 updates: [nokogiri](https://github.com/sparklemotion/nokogiri) and [rack](https://github.com/rack/rack).
 
                 Updates `sinatra` from 1.2.2 to 1.2.3
                 <details>
@@ -487,9 +488,10 @@ output:
                 </details>
                 <br />
             commit-message: |-
-                Bump the bundler at /bundler/multi-dir/foo security update group
+                Bump the bundler group across 2 directories with 3 updates
 
-                Bumps the bundler at /bundler/multi-dir/foo security update group in /bundler/multi-dir/foo with 3 updates: [sinatra](https://github.com/sinatra/sinatra), [nokogiri](https://github.com/sparklemotion/nokogiri) and [rack](https://github.com/rack/rack).
+                Bumps the bundler group across 2 directories with 2 updates: [sinatra](https://github.com/sinatra/sinatra) and [nokogiri](https://github.com/sparklemotion/nokogiri).
+                Bumps the bundler group across 2 directories with 2 updates: [nokogiri](https://github.com/sparklemotion/nokogiri) and [rack](https://github.com/rack/rack).
 
 
                 Updates `sinatra` from 1.2.2 to 1.2.3
@@ -511,7 +513,7 @@ output:
                 - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
                 - [Commits](https://github.com/rack/rack/compare/3.0.0...v3.0.7)
             dependency-group:
-                name: bundler at /bundler/multi-dir/foo security update
+                name: bundler group across 2 directories
     - type: mark_as_processed
       expect:
         data:

diff --git a/tests/smoke-cargo-group-multidir.yaml b/tests/smoke-cargo-group-multidir.yaml
@@ -373,9 +373,10 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the cargo at /cargo/multi-dir/foo security update group in /cargo/multi-dir/foo with 2 updates
+            pr-title: Bump the cargo group across 2 directories with 2 updates
             pr-body: |
-                Bumps the cargo at /cargo/multi-dir/foo security update group in /cargo/multi-dir/foo with 2 updates: [time](https://github.com/time-rs/time) and [regex](https://github.com/rust-lang/regex).
+                Bumps the cargo group across 2 directories with 2 updates: [time](https://github.com/time-rs/time) and [regex](https://github.com/rust-lang/regex).
+                Bumps the cargo group across 2 directories with 1 update: [time](https://github.com/time-rs/time).
 
                 Updates `time` from 0.3.0-alpha-1 to 0.3.0
                 <details>
@@ -576,9 +577,10 @@ output:
                 </details>
                 <br />
             commit-message: |-
-                Bump the cargo at /cargo/multi-dir/foo security update group
+                Bump the cargo group across 2 directories with 2 updates
 
-                Bumps the cargo at /cargo/multi-dir/foo security update group in /cargo/multi-dir/foo with 2 updates: [time](https://github.com/time-rs/time) and [regex](https://github.com/rust-lang/regex).
+                Bumps the cargo group across 2 directories with 2 updates: [time](https://github.com/time-rs/time) and [regex](https://github.com/rust-lang/regex).
+                Bumps the cargo group across 2 directories with 1 update: [time](https://github.com/time-rs/time).
 
 
                 Updates `time` from 0.3.0-alpha-1 to 0.3.0
@@ -596,7 +598,7 @@ output:
                 - [Changelog](https://github.com/time-rs/time/blob/main/CHANGELOG.md)
                 - [Commits](https://github.com/time-rs/time/compare/v0.3.0-alpha-1...v0.3.0)
             dependency-group:
-                name: cargo at /cargo/multi-dir/foo security update
+                name: cargo group across 2 directories
     - type: mark_as_processed
       expect:
         data:

diff --git a/tests/smoke-go-group-multidir.yaml b/tests/smoke-go-group-multidir.yaml
@@ -195,9 +195,10 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the go_modules at /go/multi-dir/foo security update group in /go/multi-dir/foo with 2 updates
+            pr-title: Bump the go_modules group across 2 directories with 2 updates
             pr-body: |
-                Bumps the go_modules at /go/multi-dir/foo security update group in /go/multi-dir/foo with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
+                Bumps the go_modules group across 2 directories with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
+                Bumps the go_modules group across 2 directories with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
 
                 Updates `rsc.io/qr` from 0.1.0 to 0.2.0
                 <details>
@@ -239,9 +240,10 @@ output:
                 </details>
                 <br />
             commit-message: |-
-                Bump the go_modules at /go/multi-dir/foo security update group
+                Bump the go_modules group across 2 directories with 2 updates
 
-                Bumps the go_modules at /go/multi-dir/foo security update group in /go/multi-dir/foo with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
+                Bumps the go_modules group across 2 directories with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
+                Bumps the go_modules group across 2 directories with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
 
 
                 Updates `rsc.io/qr` from 0.1.0 to 0.2.0
@@ -256,7 +258,7 @@ output:
                 Updates `rsc.io/quote` from 1.5.0 to 1.5.1
                 - [Commits](https://github.com/rsc/quote/compare/v1.5.0...v1.5.1)
             dependency-group:
-                name: go_modules at /go/multi-dir/foo security update
+                name: go_modules group across 2 directories
     - type: mark_as_processed
       expect:
         data:

diff --git a/tests/smoke-go-group-security.yaml b/tests/smoke-go-group-security.yaml
@@ -153,9 +153,9 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the go_modules at /go/grouped-security-update security update group in /go/grouped-security-update with 2 updates
+            pr-title: Bump the go_modules group across 1 directories group in /go/grouped-security-update with 2 updates
             pr-body: |
-                Bumps the go_modules at /go/grouped-security-update security update group in /go/grouped-security-update with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
+                Bumps the go_modules group across 1 directories group in /go/grouped-security-update with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
 
                 Updates `rsc.io/qr` from 0.1.0 to 0.2.0
                 <details>
@@ -177,9 +177,9 @@ output:
                 </details>
                 <br />
             commit-message: |-
-                Bump the go_modules at /go/grouped-security-update security update group
+                Bump the go_modules group across 1 directories group
 
-                Bumps the go_modules at /go/grouped-security-update security update group in /go/grouped-security-update with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
+                Bumps the go_modules group across 1 directories group in /go/grouped-security-update with 2 updates: [rsc.io/qr](https://github.com/rsc/qr) and [rsc.io/quote](https://github.com/rsc/quote).
 
 
                 Updates `rsc.io/qr` from 0.1.0 to 0.2.0
@@ -188,7 +188,7 @@ output:
                 Updates `rsc.io/quote` from 1.5.0 to 1.5.1
                 - [Commits](https://github.com/rsc/quote/compare/v1.5.0...v1.5.1)
             dependency-group:
-                name: go_modules at /go/grouped-security-update security update
+                name: go_modules group across 1 directories
     - type: mark_as_processed
       expect:
         data:

diff --git a/tests/smoke-gradle-group-multidir.yaml b/tests/smoke-gradle-group-multidir.yaml
@@ -325,9 +325,10 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the gradle at /gradle/multi-dir/foo security update group in /gradle/multi-dir/foo with 3 updates
+            pr-title: Bump the gradle group across 2 directories with 3 updates
             pr-body: |
-                Bumps the gradle at /gradle/multi-dir/foo security update group in /gradle/multi-dir/foo with 3 updates: [com.google.inject:guice](https://github.com/google/guice), com.google.code.findbugs:jsr305 and [org.hibernate:hibernate-core](https://github.com/hibernate/hibernate-orm).
+                Bumps the gradle group across 2 directories with 2 updates: [com.google.inject:guice](https://github.com/google/guice) and com.google.code.findbugs:jsr305.
+                Bumps the gradle group across 2 directories with 2 updates: com.google.code.findbugs:jsr305 and [org.hibernate:hibernate-core](https://github.com/hibernate/hibernate-orm).
 
                 Updates `com.google.inject:guice` from 4.2.0 to 4.2.1
                 <details>
@@ -417,9 +418,10 @@ output:
                 </details>
                 <br />
             commit-message: |-
-                Bump the gradle at /gradle/multi-dir/foo security update group
+                Bump the gradle group across 2 directories with 3 updates
 
-                Bumps the gradle at /gradle/multi-dir/foo security update group in /gradle/multi-dir/foo with 3 updates: [com.google.inject:guice](https://github.com/google/guice), com.google.code.findbugs:jsr305 and [org.hibernate:hibernate-core](https://github.com/hibernate/hibernate-orm).
+                Bumps the gradle group across 2 directories with 2 updates: [com.google.inject:guice](https://github.com/google/guice) and com.google.code.findbugs:jsr305.
+                Bumps the gradle group across 2 directories with 2 updates: com.google.code.findbugs:jsr305 and [org.hibernate:hibernate-core](https://github.com/hibernate/hibernate-orm).
 
 
                 Updates `com.google.inject:guice` from 4.2.0 to 4.2.1
@@ -435,7 +437,7 @@ output:
                 - [Changelog](https://github.com/hibernate/hibernate-orm/blob/5.3.0.Final/changelog.txt)
                 - [Commits](https://github.com/hibernate/hibernate-orm/commits/5.3.0.Final)
             dependency-group:
-                name: gradle at /gradle/multi-dir/foo security update
+                name: gradle group across 2 directories
     - type: mark_as_processed
       expect:
         data:

diff --git a/tests/smoke-maven-group-multidir.yaml b/tests/smoke-maven-group-multidir.yaml
@@ -6,6 +6,13 @@ input:
               update-type: all
         dependencies:
             - org.springframework.boot:spring-boot-starter-parent
+        ignore-conditions:
+            - dependency-name: org.springframework.boot:spring-boot-starter-parent
+              source: tests/smoke-maven-group-multidir.yaml
+              version-requirement: '>1.5.12.RELEASE'
+            - dependency-name: org.springframework.boot:spring-boot-starter-parent
+              source: tests/smoke-maven-group-multidir.yaml
+              version-requirement: '>1.5.12.RELEASE'
         security-advisories:
             - dependency-name: org.springframework.boot:spring-boot-starter-parent
               affected-versions:
@@ -305,24 +312,26 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the maven at /maven/multi-dir/foo security update group in /maven/multi-dir/foo with 1 update
+            pr-title: Bump the maven group across 2 directories with 1 update
             pr-body: |
-                Bumps the maven at /maven/multi-dir/foo security update group in /maven/multi-dir/foo with 1 update: org.springframework.boot:spring-boot-starter-parent.
+                Bumps the maven group across 2 directories with 1 update: org.springframework.boot:spring-boot-starter-parent.
+                Bumps the maven group across 2 directories with 1 update: org.springframework.boot:spring-boot-starter-parent.
 
                 Updates `org.springframework.boot:spring-boot-starter-parent` from 1.5.10.RELEASE to 1.5.12.RELEASE
 
                 Updates `org.springframework.boot:spring-boot-starter-parent` from 1.5.9.RELEASE to 1.5.12.RELEASE
             commit-message: |-
-                Bump the maven at /maven/multi-dir/foo security update group
+                Bump the maven group across 2 directories with 1 update
 
-                Bumps the maven at /maven/multi-dir/foo security update group in /maven/multi-dir/foo with 1 update: org.springframework.boot:spring-boot-starter-parent.
+                Bumps the maven group across 2 directories with 1 update: org.springframework.boot:spring-boot-starter-parent.
+                Bumps the maven group across 2 directories with 1 update: org.springframework.boot:spring-boot-starter-parent.
 
 
                 Updates `org.springframework.boot:spring-boot-starter-parent` from 1.5.10.RELEASE to 1.5.12.RELEASE
 
                 Updates `org.springframework.boot:spring-boot-starter-parent` from 1.5.9.RELEASE to 1.5.12.RELEASE
             dependency-group:
-                name: maven at /maven/multi-dir/foo security update
+                name: maven group across 2 directories
     - type: mark_as_processed
       expect:
         data:

diff --git a/tests/smoke-npm-group-multidir.yaml b/tests/smoke-npm-group-multidir.yaml
@@ -1,37 +1,49 @@
 input:
     job:
-        dependencies:
-          - "@dependabot/dummy-pkg-a"
-          - "@dependabot/dummy-pkg-b"
-          - left-pad
-        security-updates-only: true
-        security-advisories:
-          - dependency-name: left-pad
-            affected-versions:
-              - < 1.1.0
-            patched-versions: []
-            unaffected-versions: []
-          - dependency-name: "@dependabot/dummy-pkg-a"
-            affected-versions:
-              - < 1.1.0
-            patched-versions: []
-            unaffected-versions: []
-          - dependency-name: "@dependabot/dummy-pkg-b"
-            affected-versions:
-              - < 1.1.0
-            patched-versions: []
-            unaffected-versions: []
-
         package-manager: npm_and_yarn
         allowed-updates:
             - dependency-type: direct
               update-type: all
+        dependencies:
+            - '@dependabot/dummy-pkg-a'
+            - '@dependabot/dummy-pkg-b'
+            - left-pad
+        ignore-conditions:
+            - dependency-name: '@dependabot/dummy-pkg-b'
+              source: tests/smoke-npm-group-multidir.yaml
+              version-requirement: '>1.1.0'
+            - dependency-name: left-pad
+              source: tests/smoke-npm-group-multidir.yaml
+              version-requirement: '>1.3.0'
+            - dependency-name: left-pad
+              source: tests/smoke-npm-group-multidir.yaml
+              version-requirement: '>1.3.0'
+            - dependency-name: '@dependabot/dummy-pkg-a'
+              source: tests/smoke-npm-group-multidir.yaml
+              version-requirement: '>1.1.0'
+        security-advisories:
+            - dependency-name: left-pad
+              affected-versions:
+                - < 1.1.0
+              patched-versions: []
+              unaffected-versions: []
+            - dependency-name: '@dependabot/dummy-pkg-a'
+              affected-versions:
+                - < 1.1.0
+              patched-versions: []
+              unaffected-versions: []
+            - dependency-name: '@dependabot/dummy-pkg-b'
+              affected-versions:
+                - < 1.1.0
+              patched-versions: []
+              unaffected-versions: []
+        security-updates-only: true
         source:
             provider: github
             repo: dependabot/smoke-tests
             directories:
-              - /npm/multi-dir/foo
-              - /npm/multi-dir/bar
+                - /npm/multi-dir/foo
+                - /npm/multi-dir/bar
             commit: b430c0e13597246f5e81d6c4adab35602c1ddf3d
         credentials-metadata:
             - host: github.com
@@ -236,9 +248,10 @@ output:
                   operation: update
                   support_file: false
                   type: file
-            pr-title: Bump the npm_and_yarn at /npm/multi-dir/foo security update group in /npm/multi-dir/foo with 3 updates
+            pr-title: Bump the npm_and_yarn group across 2 directories with 3 updates
             pr-body: |
-                Bumps the npm_and_yarn at /npm/multi-dir/foo security update group in /npm/multi-dir/foo with 3 updates: @dependabot/dummy-pkg-b, [left-pad](https://github.com/stevemao/left-pad) and @dependabot/dummy-pkg-a.
+                Bumps the npm_and_yarn group across 2 directories with 2 updates: @dependabot/dummy-pkg-b and [left-pad](https://github.com/stevemao/left-pad).
+                Bumps the npm_and_yarn group across 2 directories with 2 updates: [left-pad](https://github.com/stevemao/left-pad) and @dependabot/dummy-pkg-a.
 
                 Updates `@dependabot/dummy-pkg-b` from 1.0.0 to 1.1.0
 
@@ -262,9 +275,10 @@ output:
 
                 Updates `@dependabot/dummy-pkg-a` from 1.0.0 to 1.1.0
             commit-message: |-
-                Bump the npm_and_yarn at /npm/multi-dir/foo security update group
+                Bump the npm_and_yarn group across 2 directories with 3 updates
 
-                Bumps the npm_and_yarn at /npm/multi-dir/foo security update group in /npm/multi-dir/foo with 3 updates: @dependabot/dummy-pkg-b, [left-pad](https://github.com/stevemao/left-pad) and @dependabot/dummy-pkg-a.
+                Bumps the npm_and_yarn group across 2 directories with 2 updates: @dependabot/dummy-pkg-b and [left-pad](https://github.com/stevemao/left-pad).
+                Bumps the npm_and_yarn group across 2 directories with 2 updates: [left-pad](https://github.com/stevemao/left-pad) and @dependabot/dummy-pkg-a.
 
 
                 Updates `@dependabot/dummy-pkg-b` from 1.0.0 to 1.1.0
@@ -277,7 +291,7 @@ output:
 
                 Updates `@dependabot/dummy-pkg-a` from 1.0.0 to 1.1.0
             dependency-group:
-                name: npm_and_yarn at /npm/multi-dir/foo security update
+                name: npm_and_yarn group across 2 directories
     - type: mark_as_processed
       expect:
         data: