pact_broker-client 1.59.0 → 1.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2804ada47fb99f8b84e46b666b3c020e69dd141910e2c4e43f1c90e0a74ebc90
-  data.tar.gz: 55cd1049f68154283ce136834a67aef813bae036139730e89c2c11d8a74a7d7e
+  metadata.gz: 8cd60c123fbe4481515d784d73f97296280109f50252c150c1c0c083813cb34b
+  data.tar.gz: 3b8371bd71d74a2b9ada1b3ba2d54a24f5ae6349ce2c6a44075e72546f6dbf6e
 SHA512:
-  metadata.gz: ae440024fcc4e5aab79d3b23c42e4419d36c4c5a35c1d09964c2887c47a2c8dbd4a3043d510536ed2a31935cb1adccc4554ba4a2a36d9b6af369ae322f84b1be
-  data.tar.gz: 7d555adb6428fe3cf3a3e642ca18ff202f9976036b4de02c683a25bbf56eaa64c5cb9cd3946c55ed8baff25a0a675c2e8a8a84497b2786c2b9fca1f26eef50c3
+  metadata.gz: 828e7e3d9eae551b586bff597b7229c5174ab4000fda79cab8567163b7b3c7443c535c35f504f530dc611bee0708240e27a8756bd394f5b9780047b3f8fc2391
+  data.tar.gz: 9d64d148a588d7aa240decdab057c2352409944036d35f6d7ff67a18f673107b7324d383a96bdaaa67b14e837556d04b87f91b5126c77e8103e4a3cffd153ff2

data/.github/workflows/release_gem.yml

@@ -31,7 +31,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - uses: pact-foundation/release-gem@v0.0.12
+    - uses: pact-foundation/release-gem@v0.0.13
       id: release
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="v1.60.0"></a>
+### v1.60.0 (2022-05-03)
+
+#### Features
+
+* support merging message pacts when publishing	 ([732b22d](/../../commit/732b22d))
+
 <a name="v1.59.0"></a>
 ### v1.59.0 (2022-03-11)
 

data/lib/pact_broker/client/merge_pacts.rb

@@ -18,29 +18,40 @@ module PactBroker
       def merge original, additional
         new_pact = JSON.parse(original.to_json, symbolize_names: true)
 
-        additional[:interactions].each do |new_interaction|
+        merge_interactions_or_messages(new_pact, original, additional, :interactions)
+        merge_interactions_or_messages(new_pact, original, additional, :messages)
+
+        new_pact
+      end
+
+      private
+
+      def merge_interactions_or_messages(new_pact, original, additional, key)
+        return unless additional[key] || original[key]
+
+        additional_messages_or_interactions = additional[key] || []
+        original_messages_or_interactions = original[key] || []
+        new_pact[key] ||= []
+
+        additional_messages_or_interactions.each do |new_interaction|
           # check to see if this interaction matches an existing interaction
-          overwrite_index = original[:interactions].find_index do |original_interaction|
+          overwrite_index = original_messages_or_interactions.find_index do |original_interaction|
             same_description_and_state?(original_interaction, new_interaction)
           end
 
           # overwrite existing interaction if a match is found, otherwise appends the new interaction
           if overwrite_index
-            if new_interaction == original[:interactions][overwrite_index]
-              new_pact[:interactions][overwrite_index] = new_interaction
+            if new_interaction == original_messages_or_interactions[overwrite_index]
+              new_pact[key][overwrite_index] = new_interaction
             else
-              raise PactMergeError, almost_duplicate_message(original[:interactions][overwrite_index], new_interaction)
+              raise PactMergeError, almost_duplicate_message(original_messages_or_interactions[overwrite_index], new_interaction)
             end
           else
-            new_pact[:interactions] << new_interaction
+            new_pact[key] << new_interaction
           end
         end
-
-        new_pact
       end
 
-      private
-
       def almost_duplicate_message(original, new_interaction)
         "Two interactions have been found with same description (#{new_interaction[:description].inspect}) and provider state (#{new_interaction[:providerState].inspect}) but a different request or response. " +
           "Please use a different description or provider state, or hard-code any random data.\n\n" +

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.59.0'
+    VERSION = '1.60.0'
   end
 end

data/spec/lib/pact_broker/client/merge_pacts_spec.rb

@@ -4,63 +4,166 @@ module PactBroker
   module Client
     describe MergePacts do
       describe ".call" do
-        let(:pact_hash_1) do
-          {
-            other: 'info',
-            interactions: [
-              {providerState: 1, description: 1, foo: 'bar' }
-            ]
-          }
-        end
+        describe "with a pact with interactions" do
+          let(:pact_hash_1) do
+            {
+              other: 'info',
+              interactions: [
+                { providerState: 1, description: 1, foo: 'bar' }
+              ]
+            }
+          end
 
-        let(:pact_hash_2) do
-          {
-            interactions: [
-              {providerState: 2, description: 2, foo: 'wiffle' }
-            ]
-          }
-        end
+          let(:pact_hash_2) do
+            {
+              interactions: [
+                { providerState: 2, description: 2, foo: 'wiffle' }
+              ]
+            }
+          end
 
-        let(:pact_hash_3) do
-          {
-            interactions: [
-              {providerState: 3, description: 3, foo: 'meep' },
-              {providerState: 1, description: 1, foo: 'bar' }
-            ]
-          }
-        end
+          let(:pact_hash_3) do
+            {
+              interactions: [
+                { providerState: 3, description: 3, foo: 'meep' },
+                { providerState: 1, description: 1, foo: 'bar' }
+              ]
+            }
+          end
 
-        let(:pact_hashes) { [pact_hash_1, pact_hash_2, pact_hash_3] }
-
-        let(:expected_merge) do
-          {
-            other: 'info',
-            interactions: [
-              {providerState: 1, description: 1, foo: 'bar' },
-              {providerState: 2, description: 2, foo: 'wiffle' },
-              {providerState: 3, description: 3, foo: 'meep' }
-            ]
-          }
-        end
+          let(:pact_hashes) { [pact_hash_1, pact_hash_2, pact_hash_3] }
+
+          let(:expected_merge) do
+            {
+              other: 'info',
+              interactions: [
+                { providerState: 1, description: 1, foo: 'bar' },
+                { providerState: 2, description: 2, foo: 'wiffle' },
+                { providerState: 3, description: 3, foo: 'meep' }
+              ]
+            }
+          end
+
+          subject { MergePacts.call(pact_hashes) }
 
-        subject { MergePacts.call(pact_hashes) }
+          it "merges the interactions by consumer/provider" do
+            expect(subject).to eq expected_merge
+          end
+
+          context "when an interaction is found with the same state and description but has a difference elsewhere" do
+            let(:pact_hash_3) do
+              {
+                interactions: [
+                  { providerState: 3, description: 3, foo: 'meep' },
+                  { providerState: 1, description: 1, foo: 'different' }
+                ]
+              }
+            end
 
-        it "merges the interactions by consumer/provider" do
-          expect(subject).to eq expected_merge
+            it "raises an error" do
+              expect { subject }.to raise_error PactMergeError, /foo.*different/
+            end
+          end
         end
 
-        context "when an interaction is found with the same state and description but has a difference elsewhere" do
+        describe "with a pact with messages" do
+          let(:pact_hash_1) do
+            {
+              other: 'info',
+              messages: [
+                { providerState: 1, description: 1, foo: 'bar' }
+              ]
+            }
+          end
+
+          let(:pact_hash_2) do
+            {
+              messages: [
+                { providerState: 2, description: 2, foo: 'wiffle' }
+              ]
+            }
+          end
+
           let(:pact_hash_3) do
+            {
+              messages: [
+                { providerState: 3, description: 3, foo: 'meep' },
+                { providerState: 1, description: 1, foo: 'bar' }
+              ]
+            }
+          end
+
+          let(:pact_hashes) { [pact_hash_1, pact_hash_2, pact_hash_3] }
+
+          let(:expected_merge) do
+            {
+              other: 'info',
+              messages: [
+                { providerState: 1, description: 1, foo: 'bar' },
+                { providerState: 2, description: 2, foo: 'wiffle' },
+                { providerState: 3, description: 3, foo: 'meep' }
+              ]
+            }
+          end
+
+          subject { MergePacts.call(pact_hashes) }
+
+          it "merges the messages by consumer/provider" do
+            expect(subject).to eq expected_merge
+          end
+
+          context "when an interaction is found with the same state and description but has a difference elsewhere" do
+            let(:pact_hash_3) do
+              {
+                messages: [
+                  { providerState: 3, description: 3, foo: 'meep' },
+                  { providerState: 1, description: 1, foo: 'different' }
+                ]
+              }
+            end
+
+            it "raises an error" do
+              expect { subject }.to raise_error PactMergeError, /foo.*different/
+            end
+          end
+        end
+
+        describe "with a pact with messages and a pact with interactions" do
+          let(:pact_hash_1) do
+            {
+              other: 'info',
+              messages: [
+                { providerState: 1, description: 1, foo: 'bar' }
+              ]
+            }
+          end
+
+          let(:pact_hash_2) do
             {
               interactions: [
-                {providerState: 3, description: 3, foo: 'meep' },
-                {providerState: 1, description: 1, foo: 'different' }
+                { providerState: 2, description: 2, foo: 'wiffle' }
               ]
             }
           end
 
-          it "raises an error" do
-            expect { subject }.to raise_error PactMergeError, /foo.*different/
+          let(:pact_hashes) { [pact_hash_1, pact_hash_2] }
+
+          let(:expected_merge) do
+            {
+              other: 'info',
+              messages: [
+                { providerState: 1, description: 1, foo: 'bar' }
+              ],
+              interactions: [
+                { providerState: 2, description: 2, foo: 'wiffle' }
+              ]
+            }
+          end
+
+          subject { MergePacts.call(pact_hashes) }
+
+          it "merges the messages by consumer/provider" do
+            expect(subject).to eq expected_merge
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.59.0
+  version: 1.60.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -425,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: See description