pact_broker 2.4.2 → 2.5.0

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

@@ -20,12 +20,22 @@ module PactBroker
           stub_request(:get, expected_url).to_return(:status => response_status, :body => "svg")
         end
 
-        let(:subject) { PactBroker::Badges::Service.pact_verification_badge pact, label, initials, verification_status }
+        subject { PactBroker::Badges::Service.pact_verification_badge pact, label, initials, verification_status }
+
+        before do
+          Service.clear_cache
+        end
 
         it "returns the svg file" do
            expect(subject).to eq "svg"
         end
 
+        it "caches the response" do
+          PactBroker::Badges::Service.pact_verification_badge pact, label, initials, verification_status
+          PactBroker::Badges::Service.pact_verification_badge pact, label, initials, verification_status
+          expect(http_request).to have_been_made.once
+        end
+
         context "when the label is not specified" do
           it "creates a badge with the consumer and provider names" do
             subject
@@ -221,6 +231,10 @@ module PactBroker
           it "returns a static image" do
             expect(subject).to include ">pact</"
           end
+
+          it "does not cache the response" do
+            expect(Service::CACHE.size).to eq 0
+          end
         end
 
         context "when the shields_io_base_url is not configured" do

data/spec/lib/pact_broker/configuration_spec.rb

@@ -10,10 +10,11 @@ module PactBroker
       describe ".html_pact_renderer" do
 
         let(:pact) { double('pact') }
+        let(:options) { double('options') }
 
         it "calls the inbuilt HtmlPactRenderer" do
-          expect(PactBroker::Api::Renderers::HtmlPactRenderer).to receive(:call).with(pact)
-          PactBroker.configuration.html_pact_renderer.call pact
+          expect(PactBroker::Api::Renderers::HtmlPactRenderer).to receive(:call).with(pact, options)
+          PactBroker.configuration.html_pact_renderer.call pact, options
         end
 
       end

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

@@ -0,0 +1,24 @@
+require 'pact_broker/domain/relationship'
+
+module PactBroker
+  module Domain
+    describe Relationship do
+      describe "#last_webhook_execution_date" do
+        let(:webhook_execution_1) { double('webhook_execution', created_at: DateTime.new(2013)) }
+        let(:webhook_execution_2) { double('webhook_execution', created_at: DateTime.new(2015)) }
+
+        let(:webhook_executions) { [webhook_execution_1, webhook_execution_2] }
+
+        before do
+          allow(webhook_executions).to receive(:sort).and_return(webhook_executions)
+        end
+
+        subject { Relationship.create(nil, nil, nil, nil, [], webhook_executions) }
+
+        it "returns the created_at date of the last execution" do
+          expect(subject.last_webhook_execution_date).to eq DateTime.new(2015)
+        end
+      end
+    end
+  end
+end

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

@@ -14,17 +14,20 @@ module PactBroker
       let(:body) { 'body' }
       let(:logs) { StringIO.new }
       let(:execution_logger) { Logger.new(logs) }
+      let(:options) { {failure_log_message: 'oops'}}
 
       subject do
         WebhookRequest.new(
           method: 'post',
           url: url,
-          headers: {'Content-Type' => 'text/plain'},
+          headers: {'Content-Type' => 'text/plain', 'Authorization' => 'foo'},
           username: username,
           password: password,
           body: body)
       end
 
+      let(:logs) { subject.execute(options).logs }
+
       describe "description" do
         it "returns a brief description of the HTTP request" do
           expect(subject.description).to eq 'POST example.org'
@@ -50,34 +53,29 @@ module PactBroker
         let!(:http_request) do
           stub_request(:post, "http://example.org/hook").
             with(:headers => {'Content-Type'=>'text/plain'}, :body => 'body').
-            to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
+            to_return(:status => 200, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
         end
 
         it "executes the configured request" do
-          subject.execute
+          subject.execute(options)
           expect(http_request).to have_been_made
         end
 
         it "logs the request" do
           allow(PactBroker.logger).to receive(:info)
           expect(PactBroker.logger).to receive(:info).with(/POST.*example.*text.*body/)
-          subject.execute
+          subject.execute(options)
         end
 
         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(:info).with(/response.*200/)
           expect(PactBroker.logger).to receive(:debug).with(/respbod/)
-          subject.execute
+          subject.execute(options)
         end
 
         describe "execution logs" do
-          before do
-
-          end
-
-          let(:logs) { subject.execute.logs }
 
           it "logs the request method and path" do
             expect(logs).to include "POST http://example.org/hook"
@@ -87,12 +85,16 @@ module PactBroker
             expect(logs).to include "Content-Type: text/plain"
           end
 
+          it "redacts potentially sensitive headers" do
+            expect(logs).to include "Authorization: [REDACTED]"
+          end
+
           it "logs the request body" do
             expect(logs).to include body
           end
 
           it "logs the response status" do
-            expect(logs).to include "HTTP/1.0 302"
+            expect(logs).to include "HTTP/1.0 200"
           end
 
           it "logs the response headers" do
@@ -103,6 +105,20 @@ module PactBroker
             expect(logs).to include "respbod"
           end
 
+          context "when the response code is a success" do
+            it "does not log the failure_log_message" do
+              allow_any_instance_of(WebhookExecutionResult).to receive(:success?).and_return(true)
+              expect(logs).to_not include "oops"
+            end
+          end
+
+          context "when the response code is not successful" do
+            it "logs the failure_log_message" do
+              allow_any_instance_of(WebhookExecutionResult).to receive(:success?).and_return(false)
+              expect(logs).to include "oops"
+            end
+          end
+
           context "with basic auth" do
             let(:username) { 'username' }
             let(:password) { 'password' }
@@ -124,11 +140,11 @@ module PactBroker
                 basic_auth: [username, password],
                 :headers => {'Content-Type'=>'text/plain'},
                 :body => 'body').
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
+              to_return(:status => 200, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "uses the credentials" do
-            subject.execute
+            subject.execute(options)
             expect(http_request_with_basic_auth).to have_been_made
           end
         end
@@ -140,11 +156,11 @@ module PactBroker
             # webmock will set the request signature scheme to 'https' _only_ if the use_ssl option is set
             stub_request(:post, "https://example.org/hook").
               with(:headers => {'Content-Type'=>'text/plain'}, :body => 'body').
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
+              to_return(:status => 200, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "uses SSL" do
-            subject.execute
+            subject.execute(options)
             expect(https_request).to have_been_made
           end
         end
@@ -155,11 +171,11 @@ module PactBroker
           let!(:http_request) do
             stub_request(:post, "http://example.org/hook").
               with(:headers => {'Content-Type'=>'text/plain'}, :body => body.to_json).
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
+              to_return(:status => 200, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "converts the body to JSON before submitting the request" do
-            subject.execute
+            subject.execute(options)
             expect(http_request).to have_been_made
           end
         end
@@ -170,22 +186,22 @@ module PactBroker
           let!(:http_request) do
             stub_request(:post, "http://example.org/hook").
               with(:headers => {'Content-Type'=>'text/plain'}, :body => nil).
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
+              to_return(:status => 200, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "executes the request without a body" do
-            subject.execute
+            subject.execute(options)
             expect(http_request).to have_been_made
           end
         end
 
         context "when the request is successful" do
           it "returns a WebhookExecutionResult with success=true" do
-            expect(subject.execute.success?).to be true
+            expect(subject.execute(options).success?).to be true
           end
 
           it "sets the response on the result" do
-            expect(subject.execute.response).to be_instance_of(Net::HTTPFound)
+            expect(subject.execute(options).response).to be_instance_of(Net::HTTPOK)
           end
         end
 
@@ -198,11 +214,11 @@ module PactBroker
           end
 
           it "returns a WebhookExecutionResult with success=false" do
-            expect(subject.execute.success?).to be false
+            expect(subject.execute(options).success?).to be false
           end
 
           it "sets the response on the result" do
-            expect(subject.execute.response).to be_instance_of(Net::HTTPInternalServerError)
+            expect(subject.execute(options).response).to be_instance_of(Net::HTTPInternalServerError)
           end
         end
 
@@ -217,22 +233,22 @@ module PactBroker
           it "logs the error" do
             allow(PactBroker.logger).to receive(:error)
             expect(PactBroker.logger).to receive(:error).with(/Error.*WebhookTestError.*blah/)
-            subject.execute
+            subject.execute(options)
           end
 
           it "returns a WebhookExecutionResult with success=false" do
-            expect(subject.execute.success?).to be false
+            expect(subject.execute(options).success?).to be false
           end
 
           it "returns a WebhookExecutionResult with an error" do
-            expect(subject.execute.error).to be_instance_of WebhookTestError
+            expect(subject.execute(options).error).to be_instance_of WebhookTestError
           end
-        end
 
+          it "logs the failure_log_message" do
+            expect(logs).to include "oops"
+          end
+        end
       end
-
     end
-
   end
-
 end

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

@@ -10,6 +10,7 @@ module PactBroker
       let(:consumer) { Pacticipant.new(name: 'Consumer')}
       let(:provider) { Pacticipant.new(name: 'Provider')}
       let(:request) { instance_double(PactBroker::Domain::WebhookRequest, execute: nil)}
+      let(:options) { double('options') }
       subject { Webhook.new(request: request, consumer: consumer, provider: provider,) }
 
       describe "description" do
@@ -21,19 +22,16 @@ module PactBroker
       describe "execute" do
 
         it "executes the request" do
-          expect(request).to receive(:execute)
-          subject.execute
+          expect(request).to receive(:execute).with(options)
+          subject.execute options
         end
 
         it "logs before and after" do
           allow(PactBroker.logger).to receive(:info)
           expect(PactBroker.logger).to receive(:info).with(/Executing/)
-          subject.execute
+          subject.execute options
         end
-
       end
     end
-
   end
-
 end

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

@@ -104,11 +104,13 @@ module PactBroker
         let(:verification) { instance_double("PactBroker::Domain::Verification")}
         let(:pacts) { [pact]}
         let(:webhooks) { [instance_double("PactBroker::Domain::Webhook")]}
+        let(:triggered_webhooks) { [instance_double("PactBroker::Webhooks::TriggeredWebhook")] }
 
         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)
           allow(PactBroker::Webhooks::Service).to receive(:find_by_consumer_and_provider).and_return(webhooks)
+          allow(PactBroker::Webhooks::Service).to receive(:find_latest_triggered_webhooks).and_return(triggered_webhooks)
         end
 
         it "retrieves the webhooks for the pact" do
@@ -139,7 +141,8 @@ module PactBroker
             .create_consumer_version_tag("prod")
             .create_pact
             .create_webhook
-            .create_webhook_execution
+            .create_triggered_webhook
+            .create_deprecated_webhook_execution
             .create_verification
         end
 
@@ -171,6 +174,12 @@ module PactBroker
               }.by(-1)
           end
 
+          it "deletes the triggered webhooks" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Webhooks::TriggeredWebhook.count
+              }.by(-1)
+          end
+
           it "deletes the webhook executions" do
             expect{ delete_consumer }.to change{
               PactBroker::Webhooks::Execution.count
@@ -215,6 +224,12 @@ module PactBroker
               }.by(-1)
           end
 
+          it "deletes the triggered webhooks" do
+            expect{ delete_provider }.to change{
+              PactBroker::Webhooks::TriggeredWebhook.count
+              }.by(-1)
+          end
+
           it "deletes the webhook executions" do
             expect{ delete_provider }.to change{
               PactBroker::Webhooks::Execution.count

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

@@ -90,7 +90,7 @@ module PactBroker
       describe "update" do
 
         let(:existing_pact) do
-          TestDataBuilder.new.create_pact_with_hierarchy "A Consumer", "1.2.3", "A Provider", original_json_content
+          TestDataBuilder.new.create_pact_with_hierarchy("A Consumer", "1.2.3", "A Provider", original_json_content).and_return(:pact)
         end
 
         before do
@@ -358,6 +358,27 @@ module PactBroker
         end
       end
 
+      describe "find_all_revisions" do
+        before do
+          TestDataBuilder.new
+            .create_pact_with_hierarchy("foo", "3.0.0", "bar")
+            .revise_pact
+            .create_pact_with_hierarchy(consumer_name, "1.2.3", provider_name)
+            .revise_pact
+            .create_consumer_version("4.5.6")
+            .create_pact
+        end
+
+        subject { Repository.new.find_all_revisions consumer_name, "1.2.3", provider_name }
+
+        it "returns all the revisions for the given pact version" do
+          expect(subject.size).to eq 2
+          expect(subject.first.consumer_name).to eq consumer_name
+          expect(subject.first.revision_number).to eq 1
+          expect(subject.last.revision_number).to eq 2
+        end
+      end
+
       describe "find_previous_pact" do
         before do
           TestDataBuilder.new

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

@@ -1,10 +1,14 @@
 require 'spec_helper'
 require 'pact_broker/pacts/service'
+require 'pact_broker/pacts/pact_params'
+
 
 module PactBroker
 
   module Pacts
-    module Service
+    describe Service do
+
+      let(:td) { TestDataBuilder.new }
 
       describe "find_distinct_pacts_between" do
         let(:pact_1) { double('pact 1', json_content: 'content 1')}
@@ -61,6 +65,33 @@ module PactBroker
           end
         end
       end
+
+      describe "delete" do
+        before do
+          td.create_pact_with_hierarchy
+            .create_webhook
+            .create_triggered_webhook
+            .create_webhook_execution
+            .create_deprecated_webhook_execution
+            .revise_pact
+        end
+
+        let(:params) do
+          {
+            consumer_name: td.consumer.name,
+            provider_name: td.provider.name,
+            consumer_version_number: td.consumer_version.number
+          }
+        end
+
+        subject { Service.delete PactParams.new(PactBroker::Pacts::PactParams.new(params)) }
+
+        it "deletes the pact" do
+          expect { subject }.to change {
+            Pacts::PactPublication.where(id: td.pact.id ).count
+          }.by(-1)
+        end
+      end
     end
   end
 end

data/spec/lib/pact_broker/ui/view_models/relationship_spec.rb

@@ -62,6 +62,50 @@ module PactBroker
           end
         end
 
+        describe "webhooks" do
+          let(:domain_relationship) do
+            instance_double("PactBroker::Domain::Relationship",
+              webhook_status: webhook_status,
+              last_webhook_execution_date: DateTime.now - 1,
+              latest_pact: double("pact", consumer: consumer, provider: provider)
+            )
+          end
+          let(:webhook_status) { :none }
+
+          subject { Relationship.new(domain_relationship) }
+
+          context "when the webhooks_status is :none" do
+            its(:webhook_label) { is_expected.to eq "Create" }
+            its(:webhook_status) { is_expected.to eq "" }
+            its(:webhook_url) { is_expected.to end_with "/webhooks/provider/Provider%20Name/consumer/Consumer%20Name"}
+          end
+
+          context "when the webhooks_status is :success" do
+            let(:webhook_status) { :success }
+            its(:webhook_label) { is_expected.to eq "1 day ago" }
+            its(:webhook_status) { is_expected.to eq "success" }
+            its(:webhook_url) { is_expected.to end_with "/webhooks/provider/Provider%20Name/consumer/Consumer%20Name/status"}
+          end
+
+          context "when the webhooks_status is :failure" do
+            let(:webhook_status) { :failure }
+            its(:webhook_label) { is_expected.to eq "1 day ago" }
+            its(:webhook_status) { is_expected.to eq "danger" }
+          end
+
+          context "when the webhooks_status is :not_run" do
+            let(:webhook_status) { :not_run }
+            its(:webhook_label) { is_expected.to eq "Not run" }
+            its(:webhook_status) { is_expected.to eq "" }
+          end
+
+          context "when the webhooks_status is :retrying" do
+            let(:webhook_status) { :retrying }
+            its(:webhook_label) { is_expected.to eq "Retrying" }
+            its(:webhook_status) { is_expected.to eq "warning" }
+          end
+        end
+
         describe "<=>" do
 
           let(:relationship_model_4) { double("PactBroker::Domain::Relationship", consumer_name: "A", provider_name: "X") }

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

@@ -101,6 +101,25 @@ module PactBroker
       end
 
       describe "#find_latest_verification_for" do
+        context "when there is a revision" do
+          before do
+            TestDataBuilder.new
+              .create_provider("Provider1")
+              .create_consumer("Consumer1")
+              .create_consumer_version("1.2.3")
+              .create_pact
+              .create_verification(number: 1, provider_version: "2.3.4")
+              .revise_pact
+              .create_verification(number: 1, provider_version: "7.8.9")
+          end
+
+          subject { Repository.new.find_latest_verification_for("Consumer1", "Provider1")}
+
+          it "finds the latest verifications for the given consumer version" do
+            expect(subject.provider_version).to eq "7.8.9"
+          end
+        end
+
         context "when no tag is specified" do
           before do
             TestDataBuilder.new

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

@@ -23,7 +23,7 @@ module PactBroker
 
       describe "#create" do
         let(:params) { {'success' => true, 'providerApplicationVersion' => '4.5.6'} }
-        let(:pact) { TestDataBuilder.new.create_pact_with_hierarchy }
+        let(:pact) { TestDataBuilder.new.create_pact_with_hierarchy.and_return(:pact) }
         let(:create_verification) { subject.create 3, params, pact }
 
         it "logs the creation" do