Merge pull request #1759 from ealesjordan/check-latest-on-main-branch

Issue 1758 - Add latest flag when comparing to the main branch
pact-foundation · Jan 17, 2024 · 51762bd · 51762bd
2 parents bcadfde + 51f9b58
commit 51762bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/PactBrokerClient.kt b/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/PactBrokerClient.kt
@@ -1155,6 +1155,7 @@ open class PactBrokerClient(
 
         if (to.mainBranch == true) {
           params.add("mainBranch" to "true")
+          params.add("latest" to "true")
         } else if (to.environment.isNullOrEmpty() && to.tag.isNullOrEmpty()) {
           params.add("latest" to "true")
         }

diff --git a/core/pactbroker/src/test/groovy/au/com/dius/pact/core/pactbroker/PactBrokerClientSpec.groovy b/core/pactbroker/src/test/groovy/au/com/dius/pact/core/pactbroker/PactBrokerClientSpec.groovy
@@ -707,9 +707,9 @@ class PactBrokerClientSpec extends Specification {
     'Test'       | ''                 | new Latest.UseLatest(true)         | new To(null, 'env1', false)   | []                                                                 || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env1'
     'Test'       | ''                 | new Latest.UseLatest(true)         | new To('tag1', 'env1', false) | []                                                                 || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env1&latest=true&tag=tag1'
     'Test'       | ''                 | new Latest.UseLatest(true)         | new To(null, 'env 1', false)  | []                                                                 || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env+1'
-    'Test'       | ''                 | new Latest.UseLatest(true)         | new To(null, 'env1', true)   | []                                                                  || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env1&mainBranch=true'
-    'Test'       | ''                 | new Latest.UseLatest(true)         | new To('tag1', 'env1', true) | []                                                                  || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env1&latest=true&tag=tag1&mainBranch=true'
-    'Test'       | ''                 | new Latest.UseLatest(true)         | new To(null, 'env 1', true)  | []                                                                  || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env+1&mainBranch=true'
+    'Test'       | ''                 | new Latest.UseLatest(true)         | new To(null, 'env1', true)   | []                                                                  || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env1&mainBranch=true&latest=true'
+    'Test'       | ''                 | new Latest.UseLatest(true)         | new To('tag1', 'env1', true) | []                                                                  || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env1&latest=true&tag=tag1&mainBranch=true&latest=true'
+    'Test'       | ''                 | new Latest.UseLatest(true)         | new To(null, 'env 1', true)  | []                                                                  || 'q[][pacticipant]=Test&latestby=cvp&q[][latest]=true&environment=env+1&mainBranch=true&latest=true'
   }
 
   @Issue('#1511')