pact_broker 1.18.0 → 2.0.0.beta.1

data/spec/lib/pact_broker/api/resources/pact_spec.rb

@@ -57,7 +57,7 @@ module PactBroker::Api
 
 
       shared_examples "an update endpoint" do |http_method|
-        subject { self.send http_method, "/pacts/provider/Provider/consumer/Consumer/version/1.2", json, {'CONTENT_TYPE' => "application/json"} ; last_response }
+        subject { self.send http_method, "/pacts/provider/Provider/consumer/Consumer/version/1.2.3", json, {'CONTENT_TYPE' => "application/json"} ; last_response }
 
         let(:response) { subject; last_response }
 

data/spec/lib/pact_broker/api/resources/pacticipants_spec.rb

@@ -68,7 +68,7 @@ module PactBroker
 
             it "creates a JSON representation of the new pacticipant" do
               expect(decorator_class).to receive(:new).with(created_model)
-              expect(decorator).to receive(:to_json).with(user_options: instance_of(Decorators::DecoratorContext))
+              expect(decorator).to receive(:to_json).with(instance_of(Decorators::DecoratorContext))
               subject
             end
 

data/spec/lib/pact_broker/api/resources/verifications_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+require 'pact_broker/api/resources/verifications'
+require 'pact_broker/pacts/service'
+require 'pact_broker/verifications/service'
+
+module PactBroker
+  module Api
+
+    module Resources
+
+      describe Verifications do
+
+        describe "post" do
+
+          let(:url) { "/pacts/provider/Provider/consumer/Consumer/pact-version/1234/verifications" }
+          let(:request_body) { {some: 'params'}.to_json }
+          subject { post url, request_body, {'CONTENT_TYPE' => 'application/json' }; last_response }
+          let(:response_body) { JSON.parse(subject.body, {symbolize_names: true}) }
+          let(:verification) { double(PactBroker::Domain::Verification) }
+          let(:errors_empty) { true }
+
+          before do
+            allow(PactBroker::Verifications::Service).to receive(:create).and_return(verification)
+            allow(PactBroker::Verifications::Service).to receive(:errors).and_return(double(:errors, messages: ['errors'], empty?: errors_empty))
+          end
+
+          it "looks up the specified pact" do
+            allow(Pacts::Service).to receive(:find_pact).with(instance_of(PactBroker::Pacts::PactParams))
+          end
+
+          context "when the pact does not exist" do
+            before do
+              allow(Pacts::Service).to receive(:find_pact).and_return(nil)
+            end
+
+            it "returns a 404" do
+              expect(subject.status).to eq 404
+            end
+          end
+
+          context "when the pact exists" do
+            let(:pact) { instance_double("PactBroker::Domain::Pact") }
+            let(:next_verification_number) { "2" }
+            let(:serialised_verification) { {some: 'verification'}.to_json }
+            let(:decorator) { instance_double('PactBroker::Api::Decorators::VerificationDecorator', to_json: serialised_verification) }
+
+            before do
+              allow(Pacts::Service).to receive(:find_pact).and_return(pact)
+              allow(PactBroker::Verifications::Service).to receive(:next_number_for).and_return(next_verification_number)
+              allow(PactBroker::Api::Decorators::VerificationDecorator).to receive(:new).and_return(decorator)
+            end
+
+            it "returns a 201" do
+              expect(subject.status).to eq 201
+            end
+
+            it "returns the path of the newly created resource in the headers" do
+              expect(subject.headers['Location']).to end_with("/verifications/2")
+            end
+
+            it "stores the verification in the database" do
+              expect(PactBroker::Verifications::Service).to receive(:create).with(next_verification_number, hash_including('some' => 'params'), pact)
+              subject
+            end
+
+            it "serialises the newly created verification" do
+              expect(PactBroker::Api::Decorators::VerificationDecorator).to receive(:new).with(verification)
+              expect(decorator).to receive(:to_json)
+              subject
+            end
+
+            it "returns the serialised verification in the response body" do
+              expect(subject.body).to eq serialised_verification
+            end
+          end
+
+          context "when invalid parameters are used" do
+            let(:errors_empty) { false }
+
+            it "returns a 400 status" do
+              expect(subject.status).to eq 400
+            end
+
+            it "sets errors on the response" do
+              expect(response_body[:errors]).to eq ['errors']
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/api/resources/webhooks_spec.rb

@@ -27,7 +27,7 @@ module PactBroker::Api
 
         it "generates a JSON representation of the webhook" do
           expect(Decorators::WebhooksDecorator).to receive(:new).with(webhooks)
-          expect(decorator).to receive(:to_json).with(user_options: instance_of(Decorators::DecoratorContext))
+          expect(decorator).to receive(:to_json).with(instance_of(Decorators::DecoratorContext))
           subject
         end
 

data/spec/lib/pact_broker/domain/order_versions_spec.rb

@@ -4,40 +4,20 @@ require 'pact_broker/domain/order_versions.rb'
 
 describe PactBroker::Domain::OrderVersions do
 
-  context "when order_versions_by_date is false (the default)" do
-    before do
-      ProviderStateBuilder.new
-        .create_condor
-        .create_condor_version('1.3.0')
-        .create_condor_version('1.5.0')
-        .create_condor_version('1.4.0')
-        .create_condor_version('1.6.0')
-    end
 
-    let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
-    let(:condor) { PactBroker::Domain::Pacticipant.where(name: 'Condor').single_record }
-
-    it "orders the versions so they can be loaded from the database in order" do
-      expect(ordered_versions).to eq(['1.3.0', '1.4.0', '1.5.0', '1.6.0'])
-    end
+  before do
+    ProviderStateBuilder.new
+      .create_condor
+      .create_condor_version('1.3.0')
+      .create_condor_version('1.5.0')
+      .create_condor_version('1.4.0')
   end
 
-  context "when order_versions_by_date is true (not recommended)" do
-    before do
-      allow(PactBroker.configuration).to receive(:order_versions_by_date).and_return(true)
-    end
-    let(:consumer) { ProviderStateBuilder.new.create_consumer.and_return(:consumer) }
-    let!(:version_1) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '2', created_at: DateTime.new(2017)) }
-    let!(:version_2) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '1', created_at: DateTime.new(2017)) }
-    let!(:version_3) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '3', created_at: DateTime.new(2016)) }
-    let!(:version_4) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '4', created_at: DateTime.new(2018)) }
-
-    let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
-
-    it "orders by date, then id" do
-      expect(ordered_versions).to eq(['3', '2', '1', '4'])
-    end
+  let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
+  let(:condor) { PactBroker::Domain::Pacticipant.where(name: 'Condor').single_record }
 
+  it "orders the versions so they can be loaded from the database in order" do
+    expect(ordered_versions).to eq(['1.3.0','1.4.0', '1.5.0'])
   end
 
 end

data/spec/lib/pact_broker/domain/verification_spec.rb

@@ -0,0 +1,41 @@
+require 'pact_broker/domain/verification'
+
+module PactBroker
+
+  module Domain
+    describe Verification do
+
+      describe "#consumer" do
+        let!(:consumer) do
+          ProviderStateBuilder.new
+            .create_consumer
+            .create_provider
+            .create_consumer_version
+            .create_pact
+            .create_verification
+            .and_return(:consumer)
+        end
+
+        it "returns the consumer for the verification" do
+          expect(Verification.order(:id).first.consumer).to eq consumer
+        end
+      end
+
+      describe "#provider" do
+        let!(:provider) do
+          ProviderStateBuilder.new
+            .create_consumer
+            .create_provider
+            .create_consumer_version
+            .create_pact
+            .create_verification
+            .and_return(:provider)
+        end
+
+        it "returns the provider for the verification" do
+          expect(Verification.order(:id).first.provider).to eq provider
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/domain/version_spec.rb

@@ -0,0 +1,26 @@
+require 'pact_broker/domain/version'
+
+module PactBroker
+
+  module Domain
+
+    describe Version do
+      describe "#latest_pact_publication" do
+        let!(:pact) do
+          ProviderStateBuilder.new
+            .create_consumer
+            .create_provider
+            .create_consumer_version
+            .create_pact
+            .revise_pact
+            .and_return(:pact)
+        end
+        let(:version) { Version.order(:id).last }
+
+        it "returns the latest pact revision for the consumer version" do
+          expect(version.latest_pact_publication.id).to eq pact.id
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/domain/webhook_request_spec.rb

@@ -64,9 +64,7 @@ module PactBroker
 
         it "logs the response" do
           allow(PactBroker.logger).to receive(:info)
-          allow(PactBroker.logger).to receive(:debug)
-          expect(PactBroker.logger).to receive(:info).with(/response.*302/)
-          expect(PactBroker.logger).to receive(:debug).with(/respbod/)
+          expect(PactBroker.logger).to receive(:info).with(/response.*302.*respbod/)
           subject.execute
         end
 

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

@@ -53,22 +53,6 @@ module PactBroker
 
       end
 
-      describe "#find_all_pacticipant_versions_in_reverse_order" do
-        before do
-          ProviderStateBuilder.new
-            .create_consumer("Foo")
-            .create_consumer_version("1.2.3")
-            .create_consumer_version("4.5.6")
-            .create_consumer("Bar")
-            .create_consumer_version("8.9.0")
-        end
-
-        subject { Repository.new.find_all_pacticipant_versions_in_reverse_order "Foo" }
-
-        it "returns all the application versions for the given consumer" do
-          expect(subject.collect(&:number)).to eq ["4.5.6", "1.2.3"]
-        end
-      end
 
     end
   end

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

@@ -3,7 +3,6 @@ require 'pact_broker/pacticipants/service'
 require 'pact_broker/domain/tag'
 require 'pact_broker/domain/pact'
 
-
 module PactBroker
 
   module Pacticipants
@@ -101,14 +100,16 @@ module PactBroker
         let(:consumer) { instance_double("PactBroker::Domain::Pacticipant")}
         let(:provider) { instance_double("PactBroker::Domain::Pacticipant")}
         let(:pact) { instance_double("PactBroker::Domain::Pact", consumer: consumer, provider: provider)}
+        let(:verification) { instance_double("PactBroker::Domain::Verification")}
         let(:pacts) { [pact]}
 
         before do
           allow_any_instance_of(PactBroker::Pacts::Repository).to receive(:find_latest_pacts).and_return(pacts)
+          allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for).and_return(verification)
         end
 
         it "returns a list of relationships" do
-          expect(subject.find_relationships).to eq([PactBroker::Domain::Relationship.create(consumer, provider)])
+          expect(subject.find_relationships).to eq([PactBroker::Domain::Relationship.create(consumer, provider, pact, verification)])
         end
 
       end
@@ -155,7 +156,7 @@ module PactBroker
 
         it "deletes the child pacts" do
           expect{ delete_pacticipant }.to change{
-            PactBroker::Pacts::DatabaseModel.count
+            PactBroker::Pacts::PactPublication.count
             }.by(-2)
         end
       end

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

@@ -8,6 +8,7 @@ module PactBroker
       let(:body) { load_fixture('a_consumer-a_provider.json') }
       let(:consumer_version_number) { '1.2.3' }
       let(:headers) { { 'X-Pact-Consumer-Version' => consumer_version_number, 'Host' => 'example.org' } }
+      let(:revision_number) { '1' }
 
       describe "from_request" do
 
@@ -17,7 +18,8 @@ module PactBroker
             {
               consumer_name: 'Consumer',
               provider_name: 'Provider',
-              consumer_version_number: '1.2.3'
+              consumer_version_number: '1.2.3',
+              revision_number: revision_number
             }
           end
 
@@ -35,6 +37,10 @@ module PactBroker
             expect(subject.consumer_version_number).to eq "1.2.3"
           end
 
+          it "extracts the revision_number from the path" do
+            expect(subject.revision_number).to eq "1"
+          end
+
           it "extracts the json_content" do
             expect(subject.json_content).to eq body
           end
@@ -47,6 +53,13 @@ module PactBroker
             expect(subject.provider_name_in_pact).to eq "A Provider"
           end
 
+          context "with no revision_number" do
+            let(:revision_number) { nil }
+            it "the revision_number is null" do
+              expect(subject.revision_number).to be nil
+            end
+          end
+
           context "with missing data" do
             let(:body){ '' }
 

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

@@ -0,0 +1,50 @@
+require 'pact_broker/pacts/pact_version'
+
+module PactBroker
+  module Pacts
+    describe PactVersion do
+
+      describe "pacticipant names" do
+        subject(:pact_version) do
+          ProviderStateBuilder.new
+            .create_consumer("consumer")
+            .create_provider("provider")
+            .create_consumer_version("1.0.1")
+            .create_pact
+          PactVersion.order(:id).last
+        end
+
+        its(:consumer_name) { is_expected.to eq("consumer") }
+        its(:provider_name) { is_expected.to eq("provider") }
+      end
+
+      describe "#latest_pact_publication" do
+
+      end
+
+      describe "#latest_consumer_version_number" do
+        before do
+          builder = ProviderStateBuilder.new
+            builder
+            .create_consumer
+            .create_provider
+            .create_consumer_version("1.0.1")
+            .create_pact
+            .create_consumer_version("1.0.0")
+            second_consumer_version = builder.and_return(:consumer_version)
+            pact_publication = PactBroker::Pacts::PactPublication.order(:id).last
+            new_params = pact_publication.to_hash
+            new_params.delete(:id)
+            new_params[:revision_number] = 2
+            new_params[:consumer_version_id] = second_consumer_version.id
+
+            PactBroker::Pacts::PactPublication.create(new_params)
+        end
+
+        it "returns the latest consumer version that has a pact that has this content" do
+          expect(PactVersion.first.latest_consumer_version_number).to eq "1.0.1"
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@
 require 'pact_broker/pacts/repository'
 require 'spec/support/provider_state_builder'
 require 'pact_broker/pacts/pact_params'
+require 'pact_broker/versions/repository'
+require 'pact_broker/pacticipants/repository'
 
 module PactBroker
   module Pacts
@@ -14,13 +16,13 @@ module PactBroker
       describe "create" do
         let(:consumer) { Pacticipants::Repository.new.create name: 'Consumer' }
         let(:provider) { Pacticipants::Repository.new.create name: 'Provider' }
-        let(:version) { Versions::Repository.new.create number: '1.2.3', pacticipant_id: consumer.id }
+        let(:version) { PactBroker::Versions::Repository.new.create number: '1.2.3', pacticipant_id: consumer.id }
         let(:json_content) { {some: 'json'}.to_json }
 
-        subject { Repository.new.create version_id: version.id, provider_id: provider.id, json_content: json_content }
+        subject { Repository.new.create version_id: version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content }
 
         it "saves the pact" do
-          expect{subject}.to change{ DatabaseModel.count }.by(1)
+          expect{subject}.to change{ PactPublication.count }.by(1)
         end
 
         it "returns a Pact::Model" do
@@ -34,22 +36,37 @@ module PactBroker
           expect(subject.consumer_version.number).to eq '1.2.3'
           expect(subject.json_content).to eq json_content
           expect(subject.created_at).to be_instance_of(DateTime)
-          expect(subject.updated_at).to be_instance_of(DateTime)
         end
 
         context "when a pact already exists with the same content" do
           let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
 
           before do
-            Repository.new.create version_id: version.id, provider_id: provider.id, json_content: json_content
+            Repository.new.create version_id: version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
           end
 
           subject do
-            Repository.new.create version_id: another_version.id, provider_id: provider.id, json_content: json_content
+            Repository.new.create version_id: another_version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
           end
 
-          it "reuses the same PactVersionContent to save room" do
-            expect { subject }.to change{ PactVersionContent.count }.by(0)
+          it "reuses the same PactVersion to save room" do
+            expect { subject }.to change{ PactVersion.count }.by(0)
+          end
+        end
+
+        context "when a pact already exists with the same content but with a different consumer/provider" do
+          let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
+          let(:another_provider) { Pacticipants::Repository.new.create name: 'Provider2' }
+          before do
+            Repository.new.create version_id: version.id, consumer_id: consumer.id, provider_id: another_provider.id, json_content: json_content
+          end
+
+          subject do
+            Repository.new.create version_id: another_version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
+          end
+
+          it "does not reuse the same PactVersion to save room" do
+            expect { subject }.to change{ PactVersion.count }.by(1)
           end
         end
 
@@ -57,15 +74,15 @@ module PactBroker
           let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
 
           before do
-            Repository.new.create version_id: version.id, provider_id: provider.id, json_content: {some_other: 'json_content'}.to_json
+            Repository.new.create version_id: version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: {some_other: 'json_content'}.to_json
           end
 
           subject do
-            Repository.new.create version_id: another_version.id, provider_id: provider.id, json_content: json_content
+            Repository.new.create version_id: another_version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
           end
 
-          it "creates a new PactVersionContent" do
-            expect { subject }.to change{ PactVersionContent.count }.by(1)
+          it "creates a new PactVersion" do
+            expect { subject }.to change{ PactVersion.count }.by(1)
           end
         end
       end
@@ -77,19 +94,16 @@ module PactBroker
         end
 
         before do
-          ::DB::PACT_BROKER_DB[:pacts]
+          ::DB::PACT_BROKER_DB[:pact_publications]
             .where(id: existing_pact.id)
             .update(
-              created_at: created_at,
-              updated_at: updated_at)
-          ::DB::PACT_BROKER_DB[:pact_version_contents]
+              created_at: created_at)
+          ::DB::PACT_BROKER_DB[:pact_versions]
               .update(
-                created_at: created_at,
-                updated_at: updated_at)
+                created_at: created_at)
         end
 
         let(:created_at) { DateTime.new(2014, 3, 2) }
-        let(:updated_at) { DateTime.new(2014, 3, 4) }
 
         let(:original_json_content) { {some: 'json'}.to_json }
         let(:json_content) { {some_other: 'json'}.to_json }
@@ -99,30 +113,48 @@ module PactBroker
 
           subject { Repository.new.update existing_pact.id, json_content: json_content }
 
-          it "updates the existing content" do
-            expect(subject.json_content).to eq json_content
+          it "creates a new PactVersion" do
+            expect { subject }.to change{ PactBroker::Pacts::PactPublication.count }.by(1)
           end
 
-          it "updates the updated_at timestamp" do
-            expect(subject.updated_at).to_not eq updated_at
+          it "creates a new PactVersion" do
+            expect { subject }.to change{ PactBroker::Pacts::PactVersion.count }.by(1)
           end
 
-          it "does not update the created_at timestamp" do
-            expect(subject.created_at).to eq created_at
+          it "does not change the existing PactVersion" do
+            existing_pvc = PactBroker::Pacts::PactVersion.order(:id).last
+            subject
+            existing_pvc_reloaded = PactBroker::Pacts::PactVersion.find(id: existing_pvc[:id])
+            expect(existing_pvc_reloaded).to eq(existing_pvc)
+          end
+
+          it "updates the existing content on the returned model" do
+            expect(subject.json_content).to eq json_content
           end
 
+          it "sets the created_at timestamp" do
+            expect(subject.created_at).to_not eq created_at
+          end
+
+          it "increments the revision_number by 1" do
+            expect(subject.revision_number).to eq 2
+          end
         end
 
         context "when the content has not changed" do
 
           subject { Repository.new.update existing_pact.id, json_content: original_json_content }
 
-          it "the json_content is the same" do
-            expect(subject.json_content).to eq original_json_content
+          it "does not create a new PactVersion" do
+            expect { subject }.to_not change{ PactBroker::Pacts::PactPublication.count }
+          end
+
+          it "does not create a new PactVersion" do
+            expect { subject }.to_not change{ PactBroker::Pacts::PactVersion.count }
           end
 
-          it "does not update the timestamp" do
-            expect(subject.updated_at).to eq updated_at
+          it "the json_content is the same" do
+            expect(subject.json_content).to eq original_json_content
           end
 
           it "does not update the created_at timestamp" do
@@ -138,6 +170,7 @@ module PactBroker
             .create_consumer_version("1.2.3")
             .create_provider(provider_name)
             .create_pact
+            .revise_pact
             .create_consumer_version("2.3.4")
             .create_pact
             .create_provider("Another Provider")
@@ -148,12 +181,12 @@ module PactBroker
 
         subject { Repository.new.delete pact_params }
 
-        it "deletes the Pact" do
-          expect { subject }.to change { DatabaseModel.count }.by(-1)
+        it "deletes all PactPublication for the specified consumer version" do
+          expect { subject }.to change { PactPublication.count }.by(-2)
         end
 
         it "does not delete the content because it may be used by another pact" do
-          expect { subject }.to change { PactVersionContent.count }.by(0)
+          expect { subject }.to change { PactVersion.count }.by(0)
         end
 
       end
@@ -256,8 +289,9 @@ module PactBroker
       end
 
       describe "find_pact" do
-        before do
-          ProviderStateBuilder.new
+        let!(:pact) do
+          builder = ProviderStateBuilder.new
+          pact = builder
             .create_consumer("Consumer")
             .create_consumer_version("1.2.2")
             .create_provider("Provider")
@@ -265,11 +299,15 @@ module PactBroker
             .create_consumer_version("1.2.4")
             .create_consumer_version_tag("prod")
             .create_pact
+            .revise_pact
+            .and_return(:pact)
+          builder
             .create_consumer_version("1.2.6")
             .create_pact
             .create_provider("Another Provider")
             .create_consumer_version("1.2.5")
             .create_pact
+          pact
         end
 
         subject  { Repository.new.find_pact "Consumer", "1.2.4", "Provider" }
@@ -282,6 +320,19 @@ module PactBroker
           expect(subject.consumer_version.tags.first.name).to eq "prod"
           expect(subject.json_content).to_not be_nil
         end
+
+        context "with a pact_version_sha" do
+          subject  { Repository.new.find_pact "Consumer", nil, "Provider", pact.pact_version_sha }
+
+          it "finds the pact with the given version and revision" do
+            expect(subject.pact_version_sha).to eq pact.pact_version_sha
+            expect(subject.consumer.name).to eq "Consumer"
+            expect(subject.provider.name).to eq "Provider"
+            expect(subject.consumer_version_number).to eq "1.2.4"
+            expect(subject.revision_number).to eq 2
+
+          end
+        end
       end
 
       describe "find_previous_pact" do
@@ -425,7 +476,6 @@ module PactBroker
 
             it "has timestamps" do
               expect(latest_prod_pact.created_at).to be_instance_of(DateTime)
-              expect(latest_prod_pact.updated_at).to be_instance_of(DateTime)
             end
           end
 
@@ -470,7 +520,6 @@ module PactBroker
         it "includes the timestamps - need to update view" do
           pacts = Repository.new.find_latest_pacts
 
-          expect(pacts[0].updated_at).to be_instance_of DateTime
           expect(pacts[0].created_at).to be_instance_of DateTime
         end
       end