pact_broker 2.27.3 → 2.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b120fc3afe15b42e4b97ca8eee39afe2f7f3070
-  data.tar.gz: 00ba1080e2f72e2fe27ed72a4adda5819cc0149a
+  metadata.gz: d4636b4295346d4ca3722a84204382c69fcedf36
+  data.tar.gz: b0d2d464ad6e2faeb3d77b054b574a4a6afa88a5
 SHA512:
-  metadata.gz: c98ee07fa57d47767ce6a17d4d158082a9dd4b966a38a308836e11347d2909e3782fab0758ab7ffd2e05eb6d8cbe8c4844debfef6d19da73f7ed7d5cd8194aa6
-  data.tar.gz: 3b120a72072e2f5363ba35a3c3467fd41facb6fd26fb2cbe65e4c6d0a8c4448ac7eb8c7f8ea640881f5a32a99af2fe4c6f1b9a08c726188ce3d1492334c8687a
+  metadata.gz: bbaeb6db596dfc7b43427e193b645431dc94e529134db0fc1b5184beee4111c5ef80fd8f6d20e86a6ec1da44bd06ec4d4b4a8aafcd31f5bbc8c0ba57aaa9d2af
+  data.tar.gz: 5e3fd018f7283e8ee7c55ad47e59d003c6499ed11dfff2cd2496e0a77d82c2de0437897bc2208bb72df1d78b8c0be2db07c84a6e69ed5faf73b218f3ed5bdf6b

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v2.27.4"></a>
+### v2.27.4 (2018-11-15)
+
+
+#### Bug Fixes
+
+* handle race conditions when creating a pacticipant	 ([b3799670](/../../commit/b3799670))
+* correct order of arguments for merging pacts	 ([f6cfb197](/../../commit/f6cfb197))
+
+
 <a name="v2.27.3"></a>
 ### v2.27.3 (2018-11-01)
 

data/lib/pact_broker/pacticipants/repository.rb

@@ -42,7 +42,13 @@ module PactBroker
       end
 
       def create args
-        PactBroker::Domain::Pacticipant.new(name: args[:name], repository_url: args[:repository_url]).save(raise_on_save_failure: true)
+        id = PactBroker::Domain::Pacticipant.dataset.insert_ignore.insert(
+          name: args[:name],
+          repository_url: args[:repository_url],
+          created_at: Sequel.datetime_class.now,
+          updated_at: Sequel.datetime_class.now
+        )
+        PactBroker::Domain::Pacticipant.find(id: id)
       end
 
       def pacticipant_names

data/lib/pact_broker/pacts/service.rb

@@ -59,7 +59,7 @@ module PactBroker
         consumer_version = version_repository.find_by_pacticipant_id_and_number_or_create consumer.id, params[:consumer_version_number]
         existing_pact = pact_repository.find_by_version_and_provider(consumer_version.id, provider.id)
 
-        params.merge!(json_content: Merger.merge_pacts(params[:json_content], existing_pact.json_content))
+        params.merge!(json_content: Merger.merge_pacts(existing_pact.json_content, params[:json_content]))
 
         update_pact params, existing_pact
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.27.3'
+  VERSION = '2.27.4'
 end

data/spec/features/merge_pact_spec.rb

@@ -29,7 +29,7 @@ describe "Merging a pact" do
     let(:merged_pact_content) { load_fixture('a_consumer-a_provider-merged.json') }
 
     before do
-      TestDataBuilder.new.create_pact_with_hierarchy("A Consumer", "1.2.3", "A Provider", existing_pact_content).and_return(:pact)
+      TestDataBuilder.new.create_pact_with_hierarchy("A Consumer", "1.2.3", "A Provider", existing_pact_content)
     end
 
     it "returns a 200 Success" do

data/spec/fixtures/a_consumer-a_provider-merged.json

@@ -7,11 +7,11 @@
   },
   "interactions": [
     {
-      "description" : "a request for something",
+      "description" : "another request for something",
       "providerState": null,
       "request": {
         "method": "get",
-        "path" : "/something"
+        "path" : "/something_else"
       },
       "response": {
         "status": 200,
@@ -19,11 +19,11 @@
       }
     },
     {
-      "description" : "another request for something",
+      "description" : "a request for something",
       "providerState": null,
       "request": {
         "method": "get",
-        "path" : "/something_else"
+        "path" : "/something"
       },
       "response": {
         "status": 200,

data/spec/lib/pact_broker/pacticipants/repository_spec.rb

@@ -5,6 +5,39 @@ require 'support/test_data_builder'
 module PactBroker
   module Pacticipants
     describe Repository do
+      describe "#create" do
+        let(:repository) { Repository.new }
+
+        subject { repository.create(name: "Foo") }
+
+        context "when the pacticipant does not already exist" do
+          before do
+            TestDataBuilder.new.create_pacticipant("Bar")
+          end
+
+          subject { repository.create(name: "Foo") }
+
+          it "returns the new pacticipant" do
+            expect(subject).to be_a(PactBroker::Domain::Pacticipant)
+            expect(subject.name).to eq "Foo"
+          end
+        end
+
+        context "when a race condition occurs and the pacticipant was already created by another request" do
+          before do
+            TestDataBuilder.new.create_pacticipant("Foo")
+          end
+
+          it "does not raise an error" do
+            subject
+          end
+
+          it "returns the existing pacticipant" do
+            expect(subject).to be_a(PactBroker::Domain::Pacticipant)
+            expect(subject.name).to eq "Foo"
+          end
+        end
+      end
 
       describe "#find" do
         before do

data/spec/lib/pact_broker/pacts/merger_spec.rb

@@ -29,43 +29,40 @@ module PactBroker
       end
 
       describe "#merge" do
-
-        before :each do
-          @pact_to_merge = load_json_fixture('consumer-provider.json')
-        end
+        let(:pact_to_merge) { load_json_fixture('consumer-provider.json') }
 
         it "merges two pacts" do
-          @pact_to_merge["interactions"] << example_interaction
-          result = merge_pacts(example_pact, @pact_to_merge)
+          pact_to_merge["interactions"] << example_interaction
+          result = merge_pacts(example_pact, pact_to_merge)
           expect(result["interactions"]).to match_array(example_pact["interactions"].push(example_interaction))
         end
 
         it "is idempotent" do
-          @pact_to_merge["interactions"] << example_interaction
-          first_result = merge_pacts(example_pact, @pact_to_merge)
-          second_result = merge_pacts(first_result, @pact_to_merge)
+          pact_to_merge["interactions"] << example_interaction
+          first_result = merge_pacts(example_pact, pact_to_merge)
+          second_result = merge_pacts(first_result, pact_to_merge)
           expect(first_result).to contain_hash second_result
         end
 
         it "overwrites identical interactions" do
-          @pact_to_merge["interactions"][0]["response"]["body"] = "changed!"
-          result = merge_pacts(example_pact, @pact_to_merge)
+          pact_to_merge["interactions"][0]["response"]["body"] = "changed!"
+          result = merge_pacts(example_pact, pact_to_merge)
 
           expect(result["interactions"].length).to eq example_pact["interactions"].length
           expect(result["interactions"].first["response"]["body"]).to eq "changed!"
         end
 
         it "appends interactions with a different provider state" do
-          @pact_to_merge["interactions"][0]["provider_state"] = "upside down"
+          pact_to_merge["interactions"][0]["provider_state"] = "upside down"
 
-          result = merge_pacts(example_pact, @pact_to_merge)
+          result = merge_pacts(example_pact, pact_to_merge)
           expect(result["interactions"].length).to eq example_pact["interactions"].length + 1
         end
 
         it "appends interactions with a different description" do
-          @pact_to_merge["interactions"][0]["description"] = "getting $$$"
+          pact_to_merge["interactions"][0]["description"] = "getting $$$"
 
-          result = merge_pacts(example_pact, @pact_to_merge)
+          result = merge_pacts(example_pact, pact_to_merge)
           expect(result["interactions"].length).to eq example_pact["interactions"].length + 1
         end
 
@@ -78,59 +75,57 @@ module PactBroker
       end
 
       describe "#conflict?" do
-        before :each do
-          @pact_to_compare = load_json_fixture('consumer-provider.json')
-        end
+        let(:pact_to_compare) { load_json_fixture('consumer-provider.json') }
 
         it "returns false if interactions have different descriptions" do
-          @pact_to_compare["interactions"][0]["description"] = "something else"
+          pact_to_compare["interactions"][0]["description"] = "something else"
 
-          expect(compare_pacts(example_pact, @pact_to_compare)).to eq false
+          expect(compare_pacts(example_pact, pact_to_compare)).to eq false
         end
 
         it "returns false if interactions have different provider states" do
-          @pact_to_compare["interactions"][0]["provider_state"] = "some other thing"
-          expect(compare_pacts(example_pact, @pact_to_compare)).to eq false
+          pact_to_compare["interactions"][0]["provider_state"] = "some other thing"
+          expect(compare_pacts(example_pact, pact_to_compare)).to eq false
         end
 
         context "when interactions have the same desc/state" do
           it "returns false if request parameters are the same" do
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq false
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq false
           end
 
           it "returns true if requests have a different query" do
-            @pact_to_compare["interactions"][0]["request"]["query"] = "foo=bar&baz=qux"
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["query"] = "foo=bar&baz=qux"
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
 
           it "returns true if requests have a different body" do
-            @pact_to_compare["interactions"][0]["request"]["body"] = { "something" => { "nested" => "deeply" } }
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["body"] = { "something" => { "nested" => "deeply" } }
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
 
           it "returns true if request method is different" do
-            @pact_to_compare["interactions"][0]["request"]["method"] = "post"
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["method"] = "post"
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
 
           it "returns true if request path is different" do
-            @pact_to_compare["interactions"][0]["request"]["path"] = "/new_path"
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["path"] = "/new_path"
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
 
           it "returns true if request headers are different" do
-            @pact_to_compare["interactions"][0]["request"]["headers"]["Content-Type"] = "text/html"
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["headers"]["Content-Type"] = "text/html"
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
 
           it "returns true if request has additional headers" do
-            @pact_to_compare["interactions"][0]["request"]["headers"]["Accept"] = "text/html"
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["headers"]["Accept"] = "text/html"
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
 
           it "returns true if request has missing headers" do
-            @pact_to_compare["interactions"][0]["request"]["headers"].delete("Content-Type")
-            expect(compare_pacts(example_pact, @pact_to_compare)).to eq true
+            pact_to_compare["interactions"][0]["request"]["headers"].delete("Content-Type")
+            expect(compare_pacts(example_pact, pact_to_compare)).to eq true
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.27.3
+  version: 2.27.4
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty