pact_broker 2.52.1 → 2.56.0

data/lib/pact_broker/ui/views/index/_css_and_js.haml

@@ -1,9 +1,9 @@
-%link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-%link{rel: 'stylesheet', href: '/stylesheets/material-menu.css'}
-%link{rel: 'stylesheet', href: '/stylesheets/material-icon.css'}
-%link{rel: 'stylesheet', href: '/stylesheets/jquery-confirm.min.css'}
-%script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-%script{type: 'text/javascript', src:'/javascripts/material-menu.js'}
-%script{type: 'text/javascript', src:'/javascripts/index.js'}
-%script{type: 'text/javascript', src:'/javascripts/clipboard.js'}
-%script{type: 'text/javascript', src:'/javascripts/jquery-confirm.min.js'}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-menu.css"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-icon.css"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/jquery-confirm.min.css"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery.tablesorter.min.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/material-menu.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/index.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/clipboard.js"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-confirm.min.js"}

data/lib/pact_broker/ui/views/index/_navbar.haml

@@ -4,11 +4,11 @@
     %ul.navbar-right#top-left-menu
       %li
         - if tag_toggle
-          %a{href: './?tags=true'}
+          %a{href: "#{base_url}?tags=true"}
             Show latest tags
         - else
-          %a{href: './'}
+          %a{href: "#{base_url}/"}
             Hide latest tags
 
-        %a{href: '/hal-browser/browser.html'}
+        %a{href: "#{base_url}/hal-browser/browser.html"}
           API Browser

data/lib/pact_broker/ui/views/index/_pagination.haml

@@ -1,4 +1,4 @@
-%script{type: 'text/javascript', src:'/javascripts/pagination.js'}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/pagination.js"}
 
 :javascript
   const PAGE_NUMBER = #{page_number};

data/lib/pact_broker/ui/views/index/show-with-tags.haml

@@ -1,7 +1,7 @@
 %body
   = render :haml, :'index/_css_and_js', :layout => false
   .container
-    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false}
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
     - if index_items.empty?
       = render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
@@ -96,8 +96,8 @@
     $(document).ready(function(){
       initializeClipper(".clippable");
 
-      $("span.pact a").load("/images/doc-text.svg");
-      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $("span.pact a").load("#{base_url}/images/doc-text.svg");
+      $("span.pact-matrix a").load("#{base_url}/images/doc-matrix.svg");
       $('td[data-toggle="tooltip"]').each(function(index, td){
         //appended tooltip div screws up table if it's appended after a
         //td, so need to append it to a div

data/lib/pact_broker/ui/views/index/show.haml

@@ -1,7 +1,7 @@
 %body
   = render :haml, :'index/_css_and_js', :layout => false
   .container
-    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true}
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
     - if index_items.empty?
       = render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
@@ -67,8 +67,8 @@
     });
 
     $(document).ready(function(){
-      $("span.pact a").load("/images/doc-text.svg");
-      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $("span.pact a").load("#{base_url}/images/doc-text.svg");
+      $("span.pact-matrix a").load("#{base_url}/images/doc-matrix.svg");
       $('td[data-toggle="tooltip"]').each(function(index, td){
         //appended tooltip div screws up table if it's appended after a
         //td, so need to append it to a div

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -2,8 +2,8 @@
 %html
   %head
     %title= defined?(title) ? title : ""
-    %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
-    %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
-    %script{type: 'text/javascript', src:'/javascripts/jquery-3.3.1.min.js'}
-    %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
+    %link{rel: 'shortcut icon', href: "#{base_url}/images/favicon.ico", type:'image/x-icon'}
+    %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
+    %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.3.1.min.js"}
+    %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.min.js"}
   = yield

data/lib/pact_broker/ui/views/matrix/show.haml

@@ -1,31 +1,34 @@
 %body
-  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
-  %link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-  %link{rel: 'stylesheet', href: '/stylesheets/matrix.css'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery-3.3.1.min.js'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-  %script{type: 'text/javascript', src:'/javascripts/matrix.js'}
-  %script{type: 'text/javascript', src:'/javascripts/clipboard.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
+  %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
+  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
+  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/matrix.css"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery-3.3.1.min.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery.tablesorter.min.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/matrix.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/clipboard.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.min.js"}
 
   .container
     .navbar-right
-      %a{href: '/'}
+      %a{href: base_url}
         Home
     %h1.page-header
       = title
+      - if defined?(badge_url) && badge_url
+        %img{src: badge_url, class: 'pact_badge' }
 
     - if defined?(errors) && errors.any?
       - errors.each do | error |
         %div.alert.alert-danger
           = escape_html(error)
 
-    %form{action: '/matrix', onsubmit:'return onSubmit()'}
+
+    %form{action: "#{base_url}/matrix", onsubmit:'return onSubmit()'}
       - selectors.each_with_index do | selector, index |
         .selector
           %label{for: "pacticipant#{index}"}
             Pacticipant name
-          %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", value: escape_html(selector.pacticipant_name)}
+          %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", class: 'pacticipant_name', value: escape_html(selector.pacticipant_name)}
 
           .input-group
 

data/lib/pact_broker/verifications/repository.rb

@@ -1,7 +1,6 @@
 require 'sequel'
 require 'pact_broker/domain/verification'
 require 'pact_broker/verifications/latest_verification_for_pact_version'
-require 'pact_broker/verifications/all_verifications'
 require 'pact_broker/verifications/sequence'
 require 'pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version'
 
@@ -107,8 +106,8 @@ module PactBroker
 
       def find_latest_verification_for_tags consumer_name, provider_name, consumer_version_tag, provider_version_tag
         view_name = PactBroker::Domain::Verification.table_name
-        consumer = pacticipant_repository.find_by_name(consumer_name)
-        provider = pacticipant_repository.find_by_name(provider_name)
+        consumer = pacticipant_repository.find_by_name!(consumer_name)
+        provider = pacticipant_repository.find_by_name!(provider_name)
 
         consumer_tag_filter = PactBroker::Repositories::Helpers.name_like(Sequel.qualify(:consumer_tags, :name), consumer_version_tag)
         provider_tag_filter = PactBroker::Repositories::Helpers.name_like(Sequel.qualify(:provider_tags, :name), provider_version_tag)
@@ -137,8 +136,8 @@ module PactBroker
       end
 
       def delete_all_verifications_between(consumer_name, options)
-        consumer = pacticipant_repository.find_by_name(consumer_name)
-        provider = pacticipant_repository.find_by_name(options.fetch(:and))
+        consumer = pacticipant_repository.find_by_name!(consumer_name)
+        provider = pacticipant_repository.find_by_name!(options.fetch(:and))
         PactBroker::Domain::Verification.where(provider: provider, consumer: consumer).delete
       end
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.52.1'
+  VERSION = '2.56.0'
 end

data/lib/pact_broker/webhooks/service.rb

@@ -40,12 +40,13 @@ module PactBroker
       def self.errors webhook, uuid = nil
         contract = PactBroker::Api::Contracts::WebhookContract.new(webhook)
         contract.validate(webhook.attributes)
-        errors = contract.errors
+        messages = contract.errors.messages
 
         if uuid && !valid_uuid_format?(uuid)
-          errors.add("uuid", message("errors.validation.invalid_webhook_uuid"))
+          messages["uuid"] = [message("errors.validation.invalid_webhook_uuid")]
         end
-        errors
+
+        OpenStruct.new(messages: messages, empty?: messages.empty?, any?: messages.any?)
       end
 
       def self.create uuid, webhook, consumer, provider

data/lib/pact_broker/webhooks/webhook_event.rb

@@ -12,7 +12,7 @@ module PactBroker
       VERIFICATION_FAILED = 'provider_verification_failed'
       DEFAULT_EVENT_NAME = CONTRACT_CONTENT_CHANGED
 
-      EVENT_NAMES = [CONTRACT_PUBLISHED, CONTRACT_CONTENT_CHANGED, VERIFICATION_PUBLISHED, VERIFICATION_FAILED]
+      EVENT_NAMES = [CONTRACT_PUBLISHED, CONTRACT_CONTENT_CHANGED, VERIFICATION_PUBLISHED, VERIFICATION_SUCCEEDED, VERIFICATION_FAILED]
 
       dataset_module do
         include PactBroker::Repositories::Helpers

data/lib/pact_broker/webhooks/webhook_request_logger.rb

@@ -33,8 +33,8 @@ module PactBroker
         safe_response = http_response ? HttpResponseWithUtf8SafeBody.new(http_response) : nil
         log_webhook_context(webhook_context)
         log_request(webhook_request)
-        log_response(uuid, safe_response) if safe_response
-        log_error(uuid, error) if error
+        log_response(uuid, safe_response, webhook_context[:base_url]) if safe_response
+        log_error(uuid, error, webhook_context[:base_url]) if error
         log_completion_message(success?(safe_response))
         log_stream.string
       end
@@ -61,17 +61,17 @@ module PactBroker
         execution_logger.info(webhook_request.body) if webhook_request.body
       end
 
-      def log_response uuid, response
+      def log_response uuid, response, base_url
         log_response_to_application_logger(uuid, response)
         if options.fetch(:show_response)
           log_response_to_execution_logger(response)
         else
-          execution_logger.info response_body_hidden_message
+          execution_logger.info response_body_hidden_message(base_url)
         end
       end
 
-      def response_body_hidden_message
-        PactBroker::Messages.message('messages.response_body_hidden')
+      def response_body_hidden_message(base_url)
+        PactBroker::Messages.message('messages.response_body_hidden', base_url: base_url)
       end
 
       def log_response_to_application_logger uuid, response
@@ -106,13 +106,13 @@ module PactBroker
         end
       end
 
-      def log_error uuid, e
+      def log_error uuid, e, base_url
         logger.info "Error executing webhook #{uuid} #{e.class.name} - #{e.message} #{e.backtrace.join("\n")}"
 
         if options[:show_response]
           execution_logger.error "Error executing webhook #{uuid} #{e.class.name} - #{e.message}"
         else
-          execution_logger.error "Error executing webhook #{uuid}. #{response_body_hidden_message}"
+          execution_logger.error "Error executing webhook #{uuid}. #{response_body_hidden_message(base_url)}"
         end
       end
 

data/pact_broker.gemspec

@@ -46,12 +46,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'httparty', '~> 0.14'
   gem.add_runtime_dependency 'json', '~> 2.3'
   gem.add_runtime_dependency 'roar', '~> 1.1'
-  gem.add_runtime_dependency 'reform', '~> 2.2'
+  gem.add_runtime_dependency 'reform', '~> 2.3','>= 2.3.1'
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
   gem.add_runtime_dependency 'sequel', '~> 5.28'
   gem.add_runtime_dependency 'webmachine', '1.5.0'
   gem.add_runtime_dependency 'semver2', '~> 3.4.2'
-  gem.add_runtime_dependency 'rack', '>= 2.0.8', '~>2.0'
+  gem.add_runtime_dependency 'rack', '~> 2.2'
   gem.add_runtime_dependency 'redcarpet', '>=3.3.2', '~>3.3'
   gem.add_runtime_dependency 'pact-support', '~> 1.14', '>= 1.14.1'
   gem.add_runtime_dependency 'padrino-core', '>= 0.14.3', '~> 0.14'

data/public/javascripts/pact.js

@@ -74,7 +74,7 @@ function promptToDeleteResource(deletionUrl, confirmationText) {
   confirmDeleteResource(confirmationText, confirmed, cancelled);
 }
 
-function createWhereToNextConfirmationConfiguration(latestPactUrl) {
+function createWhereToNextConfirmationConfiguration(latestPactUrl, indexUrl) {
   return {
     title: "Pact deleted",
     content: "Where to next?",
@@ -89,14 +89,14 @@ function createWhereToNextConfirmationConfiguration(latestPactUrl) {
       home: {
         text: "Home",
         action: function() {
-          window.location.href = "/";
+          window.location.href = indexUrl;
         }
       }
     }
   };
 }
 
-function createAllPactsDeletedConfirmationConfiguration() {
+function createAllPactsDeletedConfirmationConfiguration(indexUrl) {
   return {
     title: "Pact deleted",
     content: "All versions of this pact have now been deleted.",
@@ -104,7 +104,7 @@ function createAllPactsDeletedConfirmationConfiguration() {
       home: {
         text: "Home",
         action: function() {
-          window.location.href = "/";
+          window.location.href = indexUrl;
         }
       }
     }
@@ -115,11 +115,12 @@ function handleDeletionSuccess(responseBody) {
   if (responseBody._links["pb:latest-pact-version"]) {
     $.confirm(
       createWhereToNextConfirmationConfiguration(
-        responseBody._links["pb:latest-pact-version"].href
+        responseBody._links["pb:latest-pact-version"].href,
+        responseBody._links["index"].href
       )
     );
   } else {
-    $.confirm(createAllPactsDeletedConfirmationConfiguration());
+    $.confirm(createAllPactsDeletedConfirmationConfiguration(responseBody._links["index"].href));
   }
 }
 

data/public/stylesheets/matrix.css

@@ -28,3 +28,16 @@ span.pre-verified-icon {
 td.pact-published .tooltip-inner {
   max-width: 300px;
 }
+
+input.pacticipant_name {
+  width: 250px;
+}
+
+input.tag {
+  width: 250px;
+}
+
+img.pact_badge {
+  float: right;
+  margin-top: 15px;
+}

data/script/foo-bar-verification.json

@@ -2,8 +2,10 @@
   "success": true,
   "providerApplicationVersion": "1.0.0",
   "testResults": {
-    "examples": [
+    "tests": [
       {
+        "interactionDescription": "a request for something",
+        "interactionProviderState": null,
         "description": "has status code 200",
         "file_path": "/redacted/.gem/ruby/2.4.1/gems/pact-1.17.0/lib/pact/provider/rspec.rb",
         "full_description": "Verifying a pact between me and they Greeting with GET / returns a response which has status code 200",

data/script/foo-bar.json

@@ -17,6 +17,17 @@
         "status": 200,
         "body" : "something"
       }
+    },{
+      "description" : "a request for something else",
+      "providerState": null,
+      "request": {
+        "method": "get",
+        "path" : "/something"
+      },
+      "response": {
+        "status": 200,
+        "body" : "something"
+      }
     }
   ]
 }

data/script/seed.rb

@@ -59,7 +59,7 @@ TestDataBuilder.new
     body: webhook_body.to_json)
   .set_now(Date.today - 101)
   .tap{ | it |
-    100.times do | i |
+    2.times do | i |
       it.create_pact_with_verification("Foo", i.to_s, "Bar", i.to_s)
       .create_pact_with_verification("Bar", i.to_s, "Foo", i.to_s)
       .add_day

data/spec/features/create_webhook_spec.rb

@@ -11,7 +11,7 @@ describe "Creating a webhook" do
       description: "trigger build",
       enabled: false,
       events: [{
-        name: 'something_happened'
+        name: 'contract_content_changed'
       }],
       request: {
         method: 'POST',

data/spec/features/delete_integration_spec.rb

@@ -1,4 +1,4 @@
-describe "Deleting pact versions" do
+describe "Deleting an integration" do
 
   let(:path) { "/integrations/provider/Bar/consumer/Foo" }
 
@@ -19,7 +19,7 @@ describe "Deleting pact versions" do
     end
   end
 
-  context "when the pact does not exist" do
+  context "when the integration does not exist" do
     it "returns a 404 Not Found" do
       expect(subject.status).to be 404
     end

data/spec/features/get_matrix_badge_spec.rb

@@ -37,4 +37,13 @@ describe "get latest matrix badge with tags" do
   it "returns an svg body" do
     expect(subject.body).to include "<svg/>"
   end
+
+  context "when one of the pacticipants does not exist" do
+    let(:path) { "/matrix/provider/provider/latest/master/consumer/consumer2/latest/prod/badge" }
+
+    it "returns a 200 status as the badge content indicated the pact is not found" do
+      expect(subject.status).to eq 200
+      expect(subject.body).to include "not found"
+    end
+  end
 end

data/spec/fixtures/webhook_valid.json

@@ -1,6 +1,6 @@
 {
   "events": [{
-    "name": "something_happened"
+    "name": "contract_content_changed"
   }],
   "request": {
     "method": "POST",

data/spec/fixtures/webhook_valid_with_pacticipants.json

@@ -1,6 +1,6 @@
 {
   "events": [{
-    "name": "something_happened"
+    "name": "contract_content_changed"
   }],
   "consumer": {
     "name": "Foo"

data/spec/integration/ui/index_spec.rb

@@ -32,5 +32,21 @@ describe "UI index" do
         expect(subject.body.scan('<tr').to_a.count).to eq 3
       end
     end
+
+    context "with the base_url not set" do
+      it "returns relative links" do
+        expect(subject.body).to include "href='/stylesheets"
+      end
+    end
+
+    context "with the base_url set" do
+      before do
+        allow(PactBroker.configuration).to receive(:base_url).and_return('http://example.org/pact-broker')
+      end
+
+      it "returns absolute links" do
+        expect(subject.body).to include "href='http://example.org/pact-broker/stylesheets"
+      end
+    end
   end
 end