pact_broker 2.0.0.beta.6 → 2.0.0.beta.7

data/script/publish.sh

@@ -1,3 +1,3 @@
 curl -v -XPUT \-H "Content-Type: application/json" \
--d@spec/fixtures/a_consumer-a_provider.json \
-http://localhost:9292/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.0.0
+-d@script/foo-bar.json \
+http://127.0.0.1:9292/pacts/provider/Bar/consumer/Foo/version/1.0.0

data/script/recreate-pg-db.sh

@@ -0,0 +1,10 @@
+psql postgres -c "drop database pact_broker;"
+psql postgres -c "create database pact_broker;"
+psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE pact_broker to pact_broker;"
+ip=$(ifconfig en0 | sed -n -e '/inet/s/.*inet \([0-9.]*\) netmask .*/\1/p')
+echo ""
+echo "run the following command to set your environment variables:"
+echo "export PACT_BROKER_DATABASE_USERNAME=pact_broker"
+echo "export PACT_BROKER_DATABASE_PASSWORD=pact_broker"
+echo "export PACT_BROKER_DATABASE_NAME=pact_broker"
+echo "export PACT_BROKER_DATABASE_HOST=${ip}"

data/spec/features/get_verifications_for_consumer_version_spec.rb

@@ -27,7 +27,7 @@ describe "Get verifications for consumer version" do
     end
 
     it "returns a list of verifications" do
-      expect(last_response_body[:_embedded][:'verification-results'].size).to eq 2
+      expect(last_response_body[:_embedded][:verificationResults].size).to eq 2
     end
   end
 end

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

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description" : "a request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "post",
         "path" : "/something"

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

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description" : "another request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "get",
         "path" : "/something_else"

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

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description" : "a request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "post",
         "path" : "/something"

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

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description" : "a request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "get",
         "path" : "/something"
@@ -20,7 +20,7 @@
     },
     {
       "description" : "another request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "get",
         "path" : "/something_else"

data/spec/fixtures/a_consumer-a_provider.json

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description" : "a request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "get",
         "path" : "/something"

data/spec/fixtures/consumer-provider.json

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description" : "a request for something",
-      "provider_state": null,
+      "providerState": null,
       "request": {
         "method": "get",
         "path" : "/something",

data/spec/fixtures/renderer_pact.json

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description": "a request for alligators",
-      "provider_state": "alligators exist",
+      "providerState": "alligators exist",
       "request": {
         "method": "get",
         "path": "/alligators"

data/spec/lib/pact_broker/api/decorators/{verifications_decorator_spec.rb → verification_summary_decorator_spec.rb}

@@ -1,17 +1,21 @@
-require 'pact_broker/api/decorators/verifications_decorator'
+require 'pact_broker/api/decorators/verification_summary_decorator'
 
 module PactBroker
   module Api
     module Decorators
-      describe VerificationsDecorator do
+      describe VerificationSummaryDecorator do
+        let(:summary) { instance_double("PactBroker::Verification::SummaryForConsumerVersion", verifications: verifications, success: true, provider_summary: provider_summary) }
+        let(:provider_summary) {
+          instance_double("provider summary", successful: ["Successful provider"], failed: ["Failed provider"], unknown: ["Unknown provider"])
+        }
         let(:verifications) { [verification] }
         let(:verification) do
           instance_double("PactBroker::Domain::Verification",
             success: true, number: 1,
             provider_version: '4.5.6',
             build_url: 'http://some-build',
-            provider_name: 'provider',
-            consumer_name: 'consumer',
+            provider_name: 'Provider',
+            consumer_name: 'Consumer',
             pact_version: pact_version,
             latest_pact_publication: pact,
             execution_date: DateTime.now)
@@ -19,14 +23,15 @@ module PactBroker
         let(:pact_version) do
           instance_double("PactBroker::Pacts::PactVersion", sha: '1234', name: 'Name')
         end
+
         let(:pact) { instance_double("PactBroker::Domain::Pact", name: "Some pact", consumer_name: "Foo", provider_name: "Bar", consumer_version_number: "1.2.3") }
         let(:options) { {base_url: 'http://example.org', consumer_name: "Foo", consumer_version_number: "1.2.3", resource_url: "http://self"} }
 
-        subject { JSON.parse VerificationsDecorator.new(verifications).to_json(user_options: options), symbolize_names: true }
+        subject { JSON.parse VerificationSummaryDecorator.new(summary).to_json(user_options: options), symbolize_names: true }
 
         it "includes a list of verification results" do
-          expect(subject[:_embedded][:'verification-results']).to be_instance_of(Array)
-          expect(subject[:_embedded][:'verification-results'].size).to eq 1
+          expect(subject[:_embedded][:verificationResults]).to be_instance_of(Array)
+          expect(subject[:_embedded][:verificationResults].size).to eq 1
         end
 
         it "includes a title" do
@@ -41,12 +46,10 @@ module PactBroker
           expect(subject[:success]).to be true
         end
 
-        context "when there are no verifications" do
-          let(:verifications) { [] }
-
-          it "does not include a flag to indicate the overall success or failure of all the verification results" do
-            expect(subject).to_not have_key(:success)
-          end
+        it "includes a provider summary" do
+          expect(subject[:providerSummary][:successful]).to eq ["Successful provider"]
+          expect(subject[:providerSummary][:failed]).to eq ["Failed provider"]
+          expect(subject[:providerSummary][:unknown]).to eq ["Unknown provider"]
         end
       end
     end

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

@@ -24,23 +24,23 @@ module PactBroker
 
           context "when the consumer version exists" do
             let(:decorator) { double(:decorator, to_json: json) }
-            let(:verifications) { double(:verifications) }
+            let(:summary) { double(:summary) }
             let(:json) { {some: 'json'}.to_json }
 
             before do
-              allow(PactBroker::Api::Decorators::VerificationsDecorator).to receive(:new).and_return(decorator)
-              allow(PactBroker::Verifications::Service).to receive(:find_latest_verifications_for_consumer_version).and_return(verifications)
+              allow(PactBroker::Api::Decorators::VerificationSummaryDecorator).to receive(:new).and_return(decorator)
+              allow(PactBroker::Verifications::Service).to receive(:verification_summary_for_consumer_version).and_return(summary)
             end
 
             it { is_expected.to be_a_hal_json_success_response }
 
             it "finds the latest verifications for the consumer version" do
-              expect(PactBroker::Verifications::Service).to receive(:find_latest_verifications_for_consumer_version).with(hash_including(consumer_name: 'Consumer', consumer_version_number: '1.2.3'))
+              expect(PactBroker::Verifications::Service).to receive(:verification_summary_for_consumer_version).with(hash_including(consumer_name: 'Consumer', consumer_version_number: '1.2.3'))
               subject
             end
 
             it "serialises the verifications" do
-              expect(PactBroker::Api::Decorators::VerificationsDecorator).to receive(:new).with(verifications)
+              expect(PactBroker::Api::Decorators::VerificationSummaryDecorator).to receive(:new).with(summary)
               expect(decorator).to receive(:to_json) do | args |
                 expect(args[:user_options][:consumer_name]).to eq 'Consumer'
                 expect(args[:user_options][:consumer_version_number]).to eq '1.2.3'

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

@@ -4,20 +4,40 @@ 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
 
-  before do
-    ProviderStateBuilder.new
-      .create_condor
-      .create_condor_version('1.3.0')
-      .create_condor_version('1.5.0')
-      .create_condor_version('1.4.0')
+    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
   end
 
-  let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
-  let(:condor) { PactBroker::Domain::Pacticipant.where(name: 'Condor').single_record }
+  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
 
-  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/webhook_request_spec.rb

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

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

@@ -53,6 +53,22 @@ 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

@@ -90,6 +90,7 @@ module PactBroker
         end
 
         it "logs the names" do
+          allow(PactBroker.logger).to receive(:info)
           expect(PactBroker.logger).to receive(:info).with(/pacticipant_name.*Fred, Mary/)
           subject.find_potential_duplicate_pacticipants pacticipant_name
         end
@@ -126,39 +127,88 @@ module PactBroker
             .create_consumer_version_tag("prod")
             .create_pact
             .create_webhook
+            .create_verification
         end
 
-        let(:delete_pacticipant) { subject.delete "Consumer" }
+        let(:delete_consumer) { subject.delete "Consumer" }
+        let(:delete_provider) { subject.delete "Provider" }
 
-        it "deletes the pacticipant" do
-          expect{ delete_pacticipant }.to change{
-              PactBroker::Domain::Pacticipant.all.count
-            }.by(-1)
-        end
+        context "deleting a consumer" do
+          it "deletes the pacticipant" do
+            expect{ delete_consumer }.to change{
+                PactBroker::Domain::Pacticipant.all.count
+              }.by(-1)
+          end
 
-        it "deletes the child versions" do
-          expect{ delete_pacticipant }.to change{
-            PactBroker::Domain::Version.where(number: "1.2.3").count
-            }.by(-1)
-        end
+          it "deletes the child versions" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Domain::Version.where(number: "1.2.3").count
+              }.by(-1)
+          end
 
-        it "deletes the child tags" do
-          expect{ delete_pacticipant }.to change{
-            PactBroker::Domain::Tag.where(name: "prod").count
-            }.by(-1)
-        end
+          it "deletes the child tags" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Domain::Tag.where(name: "prod").count
+              }.by(-1)
+          end
 
-        it "deletes the webhooks" do
-          expect{ delete_pacticipant }.to change{
-            PactBroker::Webhooks::Webhook.count
-            }.by(-1)
+          it "deletes the webhooks" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Webhooks::Webhook.count
+              }.by(-1)
+          end
+
+          it "deletes the child pacts" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Pacts::PactPublication.count
+              }.by(-2)
+          end
+
+          it "deletes the verifications" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Domain::Verification.count
+              }.by(-1)
+          end
         end
 
-        it "deletes the child pacts" do
-          expect{ delete_pacticipant }.to change{
-            PactBroker::Pacts::PactPublication.count
-            }.by(-2)
+        context "deleting a provider" do
+          it "deletes the pacticipant" do
+            expect{ delete_provider }.to change{
+                PactBroker::Domain::Pacticipant.all.count
+              }.by(-1)
+          end
+
+          it "does not delete any versions" do
+            expect{ delete_provider }.to change{
+              PactBroker::Domain::Version.where(number: "1.2.3").count
+              }.by(0)
+          end
+
+          it "deletes the child tags only if there are any" do
+            expect{ delete_provider }.to change{
+              PactBroker::Domain::Tag.where(name: "prod").count
+              }.by(0)
+          end
+
+          it "deletes the webhooks" do
+            expect{ delete_provider }.to change{
+              PactBroker::Webhooks::Webhook.count
+              }.by(-1)
+          end
+
+          it "deletes the child pacts" do
+            expect{ delete_provider }.to change{
+              PactBroker::Pacts::PactPublication.count
+              }.by(-2)
+          end
+
+          it "deletes the verifications" do
+            expect{ delete_provider }.to change{
+              PactBroker::Domain::Verification.count
+              }.by(-1)
+          end
         end
+
       end
 
     end

data/spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb

@@ -0,0 +1,72 @@
+require 'pact_broker/verifications/summary_for_consumer_version'
+
+module PactBroker
+  module Verifications
+    describe SummaryForConsumerVersion do
+
+      let(:verifications) { [verification_1, verification_2] }
+      let(:verification_1) do
+        instance_double("PactBroker::Domain::Verification",
+          success: true,
+          provider_name: 'Successful Provider'
+        )
+      end
+      let(:verification_2) do
+        instance_double("PactBroker::Domain::Verification",
+          success: false,
+          provider_name: 'Failed Provider'
+        )
+      end
+
+      let(:pact_1) { instance_double("pact", provider_name: 'Successful Provider') }
+      let(:pact_2) { instance_double("pact", provider_name: 'Failed Provider') }
+      let(:pact_3) { instance_double("pact", provider_name: 'Unknown Provider') }
+
+      let(:pacts) do
+        [pact_1, pact_2, pact_3]
+      end
+
+      subject { SummaryForConsumerVersion.new(verifications, pacts)}
+
+      describe "#provider_summary" do
+        it "returns the successful providers" do
+          expect(subject.provider_summary.successful).to eq ["Successful Provider"]
+        end
+
+        it "returns the failed providers" do
+          expect(subject.provider_summary.failed).to eq ["Failed Provider"]
+        end
+
+        it "returns the unknown providers" do
+          expect(subject.provider_summary.unknown).to eq ["Unknown Provider"]
+        end
+      end
+
+      describe "success" do
+        context "when all pacts have a successful verification" do
+          let(:verifications) { [verification_1] }
+          let(:pacts) { [[pact_1]] }
+          its(:success) { is_expected.to be true }
+        end
+
+        context "when some pacts have not been verified" do
+          let(:verifications) { [] }
+          let(:pacts) { [[pact_1]] }
+          its(:success) { is_expected.to be false }
+        end
+
+        context "when some pacts have failed verification" do
+          let(:verifications) { [verification_2] }
+          let(:pacts) { [[pact_2]] }
+          its(:success) { is_expected.to be false }
+        end
+
+        context "when there are no verifications" do
+          let(:verifications) { [] }
+          let(:pacts) { [[pact_2]] }
+          its(:success) { is_expected.to be false }
+        end
+      end
+    end
+  end
+end