pact_broker 2.12.0 → 2.13.0

data/spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb

@@ -12,6 +12,7 @@ module PactBroker
             provider_version_number: "4.5.6",
             provider_name: 'Provider',
             consumer_name: 'Consumer',
+            test_results: { 'arbitrary' => 'json' },
             build_url: 'http://build-url',
             pact_version_sha: '1234',
             latest_pact_publication: pact_publication,
@@ -39,6 +40,10 @@ module PactBroker
           expect(subject[:providerApplicationVersion]).to eq "4.5.6"
         end
 
+        it "includes the test results" do
+          expect(subject[:testResults]).to eq(arbitrary: 'json')
+        end
+
         it "includes the build URL" do
           expect(subject[:buildUrl]).to eq "http://build-url"
         end

data/spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb

@@ -19,6 +19,7 @@ module PactBroker
             pact_version: pact_version,
             pact_version_sha: '1234',
             latest_pact_publication: pact,
+            test_results: nil,
             execution_date: DateTime.now)
         end
         let(:pact_version) do

data/spec/lib/pact_broker/api/decorators/webhook_decorator_spec.rb

@@ -21,6 +21,7 @@ module PactBroker
 
         let(:consumer) { Domain::Pacticipant.new(name: 'Consumer') }
         let(:provider) { Domain::Pacticipant.new(name: 'Provider') }
+        let(:event)    { Webhooks::WebhookEvent.new(name: 'something_happened') }
         let(:created_at) { DateTime.now }
         let(:updated_at) { created_at + 1 }
 
@@ -30,6 +31,7 @@ module PactBroker
             uuid: 'some-uuid',
             consumer: consumer,
             provider: provider,
+            events: [event],
             created_at: created_at,
             updated_at: updated_at
           )
@@ -44,26 +46,14 @@ module PactBroker
             expect(parsed_json[:request]).to eq request
           end
 
-          it 'includes an embedded consumer' do
-            expect(parsed_json[:_embedded][:consumer]).to eq ({
-              name: 'Consumer',
-              _links: {
-                self: {
-                  href: 'http://example.org/pacticipants/Consumer'
-                }
-              }
-            })
+          it 'includes a link to the consumer' do
+            expect(parsed_json[:_links][:'pb:consumer'][:name]).to eq 'Consumer'
+            expect(parsed_json[:_links][:'pb:consumer'][:href]).to eq 'http://example.org/pacticipants/Consumer'
           end
 
-          it 'includes an embedded provider' do
-            expect(parsed_json[:_embedded][:provider]).to eq ({
-              name: 'Provider',
-              _links: {
-                self: {
-                  href: 'http://example.org/pacticipants/Provider'
-                }
-              }
-            })
+          it 'includes a link to the provider' do
+            expect(parsed_json[:_links][:'pb:provider'][:name]).to eq 'Provider'
+            expect(parsed_json[:_links][:'pb:provider'][:href]).to eq 'http://example.org/pacticipants/Provider'
           end
 
           it 'includes a link to itself' do
@@ -83,6 +73,10 @@ module PactBroker
             expect(parsed_json[:_links][:'pb:execute'][:href]).to eq 'http://example.org/webhooks/some-uuid/execute'
           end
 
+          it 'includes the events' do
+            expect(parsed_json[:events].first).to eq name: 'something_happened'
+          end
+
           it 'includes timestamps' do
             expect(parsed_json[:createdAt]).to eq created_at.xmlschema
             expect(parsed_json[:updatedAt]).to eq updated_at.xmlschema
@@ -97,7 +91,8 @@ module PactBroker
         end
 
         describe 'from_json' do
-          let(:hash) { { request: request } }
+          let(:hash) { { request: request, events: [event] } }
+          let(:event) { {name: 'something_happened'} }
           let(:json) { hash.to_json }
           let(:webhook) { Domain::Webhook.new }
           let(:parsed_object) { subject.from_json(json) }
@@ -117,6 +112,21 @@ module PactBroker
           it 'parses the request body' do
             expect(parsed_object.request.body).to eq 'some' => 'body'
           end
+
+          it 'parses the events' do
+            expect(parsed_object.events.size).to eq 1
+            expect(parsed_object.events.first.name).to eq 'something_happened'
+          end
+
+          context "when no events are specified" do
+            let(:hash) { { request: request } }
+            let(:webhook) { Domain::Webhook.new }
+
+            it "defaults to a single contract_changed event for backwards compatibility" do
+              expect(parsed_object.events.size).to eq 1
+              expect(parsed_object.events.first.name).to eq PactBroker::Webhooks::WebhookEvent::DEFAULT_EVENT_NAME
+            end
+          end
         end
       end
     end

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

@@ -1,5 +1,6 @@
 require 'pact_broker/api/resources/badge'
 require 'pact_broker/badges/service'
+require 'pact_broker/matrix/service'
 
 module PactBroker
   module Api
@@ -118,6 +119,66 @@ module PactBroker
               subject
             end
           end
+
+          context "when retrieving the badge for a matrix row by tag" do
+            before do
+              allow(PactBroker::Matrix::Service).to receive(:find_for_consumer_and_provider_with_tags).and_return(row)
+              allow(PactBroker::Verifications::Service).to receive(:find_by_id).and_return(verification)
+            end
+
+            let(:path) { "/matrix/provider/provider/latest/master/consumer/consumer/latest/prod/badge" }
+            let(:row) { { verification_id: 1 } }
+
+
+            it "looks up the matrix row" do
+              expect(PactBroker::Matrix::Service).to receive(:find_for_consumer_and_provider_with_tags).with(
+                hash_including(consumer_name: 'consumer',
+                provider_name: 'provider',
+                tag: 'prod',
+                provider_tag: 'master'
+              ))
+              subject
+            end
+
+            context "when a matrix row is found" do
+              context "when there is a verification_id" do
+                it "looks up the verification" do
+                  expect(PactBroker::Verifications::Service).to receive(:find_by_id).with(1)
+                  subject
+                end
+
+                it "returns the badge" do
+                  expect(subject.body).to eq "badge"
+                end
+              end
+
+              context "when there is not a verification_id" do
+                let(:row) { {} }
+
+                it "does not look up the verification" do
+                  expect(PactBroker::Verifications::Service).to_not receive(:find_by_id)
+                  subject
+                end
+
+                it "returns the badge" do
+                  expect(subject.body).to eq "badge"
+                end
+              end
+            end
+
+            context "when a matrix row is not found" do
+              let(:row) { nil }
+
+              it "does not look up the verification" do
+                expect(PactBroker::Verifications::Service).to_not receive(:find_by_id)
+                subject
+              end
+
+              it "returns the badge" do
+                expect(subject.body).to eq "badge"
+              end
+            end
+          end
         end
       end
     end

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

@@ -0,0 +1,11 @@
+require 'pact_broker/api/resources/matrix_badge'
+
+module PactBroker
+  module Api
+    module Resources
+      describe MatrixBadge do
+        # spec is in spec/lib/pact_broker/api/resources/badge_spec.rb#123 to avoid duplication
+      end
+    end
+  end
+end

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

@@ -13,12 +13,14 @@ module PactBroker::Api
       let(:headers) { {'CONTENT_TYPE' => 'application/json'} }
       let(:webhook) { double('webhook')}
       let(:saved_webhook) { double('saved_webhook')}
-      let(:provider) { instance_double(PactBroker::Domain::Pacticipant)}
-      let(:consumer) { instance_double(PactBroker::Domain::Pacticipant)}
+      let(:provider) { instance_double(PactBroker::Domain::Pacticipant) }
+      let(:consumer) { instance_double(PactBroker::Domain::Pacticipant) }
+      let(:webhook_decorator) { instance_double(Decorators::WebhookDecorator, from_json: webhook) }
 
       before do
         allow(PactBroker::Pacticipants::Service).to receive(:find_pacticipant_by_name).with("Some Provider").and_return(provider)
         allow(PactBroker::Pacticipants::Service).to receive(:find_pacticipant_by_name).with("Some Consumer").and_return(consumer)
+        allow(Decorators::WebhookDecorator).to receive(:new).and_return(webhook_decorator)
       end
 
       describe "GET" do
@@ -83,6 +85,7 @@ module PactBroker::Api
 
         context "when the provider is not found" do
           let(:provider) { nil }
+
           it "returns a 404 status" do
             subject
             expect(last_response.status).to eq 404
@@ -142,10 +145,10 @@ module PactBroker::Api
         context "with valid attributes" do
 
           let(:webhook_response_json) { {some: 'webhook'}.to_json }
-          let(:decorator) { instance_double(Decorators::WebhookDecorator) }
 
           before do
             allow_any_instance_of(Decorators::WebhookDecorator).to receive(:to_json).and_return(webhook_response_json)
+            allow(webhook_decorator).to receive(:to_json).and_return(webhook_response_json)
           end
 
           it "saves the webhook" do
@@ -169,9 +172,8 @@ module PactBroker::Api
           end
 
           it "generates the JSON response body" do
-            allow(Decorators::WebhookDecorator).to receive(:new).and_call_original #Deserialise
-            expect(Decorators::WebhookDecorator).to receive(:new).with(saved_webhook).and_return(decorator) #Serialize
-            expect(decorator).to receive(:to_json).with(user_options: { base_url: 'http://example.org' })
+            expect(Decorators::WebhookDecorator).to receive(:new).with(saved_webhook).and_return(webhook_decorator)
+            expect(webhook_decorator).to receive(:to_json).with(user_options: { base_url: 'http://example.org' })
             subject
           end
 
@@ -180,10 +182,7 @@ module PactBroker::Api
             expect(last_response.body).to eq webhook_response_json
           end
         end
-
       end
-
     end
   end
-
 end

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

@@ -0,0 +1,60 @@
+require 'pact_broker/certificates/service'
+
+module PactBroker
+  module Certificates
+    describe Service do
+      let(:certificate_content) { File.read('spec/fixtures/certificate.pem') }
+
+      describe "#cert_store" do
+        subject { Service.cert_store }
+
+        it "returns an OpenSSL::X509::Store" do
+          expect(subject).to be_instance_of(OpenSSL::X509::Store)
+        end
+
+        context "when there is a duplicate certificate" do
+          before do
+            Certificate.create(uuid: '1234', content: certificate_content)
+            Certificate.create(uuid: '5678', content: certificate_content)
+          end
+
+          it "logs the error" do
+            expect(PactBroker.logger).to receive(:error).with(/Error adding certificate/).at_least(1).times
+            subject
+          end
+
+          it "returns an OpenSSL::X509::Store" do
+            expect(subject).to be_instance_of(OpenSSL::X509::Store)
+          end
+        end
+      end
+
+      describe "#find_all_certificates" do
+        let!(:certificate) do
+          Certificate.create(uuid: '1234', content: certificate_content)
+        end
+
+        subject { Service.find_all_certificates }
+
+        context "with a valid certificate file" do
+          it "returns all the X509 Certificate objects" do
+            expect(subject.size).to eq 2
+          end
+        end
+
+        context "with an invalid certificate file" do
+          let(:certificate_content) { File.read('spec/fixtures/certificate-invalid.pem') }
+
+          it "logs an error" do
+            expect(PactBroker.logger).to receive(:error).with(/Error.*1234/)
+            subject
+          end
+
+          it "returns all the valid X509 Certificate objects" do
+            expect(subject.size).to eq 1
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,19 @@ module PactBroker
   module Domain
     describe Verification do
 
+      describe "#save" do
+        let!(:verification) do
+          TestDataBuilder.new
+            .create_pact_with_hierarchy("A", "1", "B")
+            .create_verification(test_results: {'some' => 'thing'})
+            .and_return(:verification)
+        end
+
+        it "saves and loads the test_results" do
+          expect(Verification.find(id: verification.id).test_results).to eq({ 'some' => 'thing' })
+        end
+      end
+
       describe "#consumer" do
         let!(:consumer) do
           TestDataBuilder.new

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

@@ -3,9 +3,7 @@ require 'pact_broker/domain/webhook_request'
 require 'webmock/rspec'
 
 module PactBroker
-
   module Domain
-
     describe WebhookRequest do
       before do
         allow(PactBroker::Api::PactBrokerUrls).to receive(:pact_url).and_return('http://example.org/pact-url')
@@ -33,7 +31,6 @@ module PactBroker
 
       let(:logs) { subject.execute(pact, options).logs }
 
-
       describe "description" do
         it "returns a brief description of the HTTP request" do
           expect(subject.description).to eq 'POST example.org'
@@ -55,7 +52,6 @@ module PactBroker
       end
 
       describe "execute" do
-
         let!(:http_request) do
           stub_request(:post, "http://example.org/hook").
             with(:headers => {'Content-Type'=>'text/plain'}, :body => 'body').

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

@@ -63,14 +63,6 @@ module PactBroker
           end
         end
 
-        context "when the pacticipant name and version are not specified" do
-          let(:selectors) { [{ pacticipant_name: nil, pacticipant_version_number: nil }] }
-
-          it "returns error messages" do
-            expect(subject.first).to eq "Please specify the pacticipant name and version"
-          end
-        end
-
         context "when the latest_tag is used instead of a version" do
           before do
             td.create_pacticipant("Foo")
@@ -130,6 +122,46 @@ module PactBroker
           end
         end
       end
+
+      describe "find_for_consumer_and_provider_with_tags integration test" do
+
+        let(:params) do
+          {
+            consumer_name: 'consumer',
+            provider_name: 'provider',
+            tag: 'prod',
+            provider_tag: 'master'
+          }
+        end
+
+        subject { Service.find_for_consumer_and_provider_with_tags(params) }
+
+        context "when the specified row exists" do
+          before do
+            td.create_pact_with_hierarchy('consumer', '1', 'provider')
+              .create_consumer_version_tag('prod')
+              .create_verification(provider_version: '2')
+              .use_provider_version('2')
+              .create_provider_version_tag('master')
+              .create_verification(provider_version: '3', number: 2)
+              .create_consumer_version('2')
+              .create_pact
+          end
+
+          it "returns the row" do
+            expect(subject[:consumer_name]).to eq 'consumer'
+            expect(subject[:provider_name]).to eq 'provider'
+            expect(subject[:consumer_version_number]).to eq '1'
+            expect(subject[:provider_version_number]).to eq '2'
+          end
+        end
+
+        context "when the specified row does not exist" do
+          it "returns nil" do
+            expect(subject).to be nil
+          end
+        end
+      end
     end
   end
 end

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

@@ -347,7 +347,7 @@ module PactBroker
         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
+          it "finds the pact with the given pact_version_sha" 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"
@@ -355,7 +355,24 @@ module PactBroker
             expect(subject.revision_number).to eq 2
 
           end
+          context "when there are multiple pact publications for the pact version" do
+            before do
+              # Double check the data is set up correctly...
+              expect(pact_1.pact_version_sha).to eq(pact_2.pact_version_sha)
+            end
+
+            let(:td) { TestDataBuilder.new }
+            let!(:pact_1) { td.create_pact_with_hierarchy("Foo", "1", "Bar").and_return(:pact) }
+            let!(:pact_2) { td.create_consumer_version("2").create_pact(json_content: pact_1.json_content).and_return(:pact) }
+
+            subject  { Repository.new.find_pact "Foo", nil, "Bar", pact_1.pact_version_sha }
+
+            it "returns the latest pact, ordered by consumer version order" do
+              expect(subject.consumer_version_number).to eq "2"
+            end
+          end
         end
+
       end
 
       describe "find_all_revisions" do