pact_broker 2.52.2 → 2.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd447b5cac167d4f764356d1c15c826a7de019d1871c684853ef602862cf387
-  data.tar.gz: '07328be4c8851d55e5a5834f69ce83e22df99c93cf83a21a657e1587f7afd8b3'
+  metadata.gz: 146cb79312c70762f13a8a49ebd8cd52e33dc11669b5f647551624cd1bbdd8c7
+  data.tar.gz: c8d41ae4b4dd59fa6684ecce7572ed9e31d5c96bfeadbc078d8e0eb8c2e5e4dc
 SHA512:
-  metadata.gz: 9b8420208b660677ba8f93373346ad39e80069ba282dd9ebd7206bf65ebdf05f7803c303c1e6e0a4ebc7f69d3ff6ea2b55ecfe4e56a2735975827bad26e10370
-  data.tar.gz: fecbcc5f5a4824d2dc3669d6bb4bb15456ad1434031dad96e71bd571e9f92fd73d1b90b142f0d0359d6943ab618768ba607f99119fa61ffb56f75f6fb8e29ef3
+  metadata.gz: b3d9ad57dc60c6cb6c8c4edead5b7cd10b69de4d63d4b5e355bf5cf5d0edf8f410a69601ef4a002d645c968e0b446dddc6b8a0b63ddb10aa9a51b3cc2331a398
+  data.tar.gz: 50c7b30d1994654117c68db4b47ef9afd6d734691da60723c27ce717ca4313facaffa1cde5c43d388c82fcf3a3a47d08813cbc942aefd7168c4125f832cff4e9

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="v2.53.0"></a>
+### v2.53.0 (2020-05-12)
+
+
+#### Features
+
+* **badge**
+  * include tag names in matrix badge	 ([cce7cd01](/../../commit/cce7cd01))
+
+
+#### Bug Fixes
+
+* **pacts for verification**
+  * ensure a separate pact URL is returned for each consumer when multiple consumers share the same pact json content	 ([13e7b640](/../../commit/13e7b640))
+
+* gracefully handle fetching matrix badge when specified pact does not exist	 ([e8ec4101](/../../commit/e8ec4101))
+* include the base URL in the link to the webhook docs	 ([5363ab2e](/../../commit/5363ab2e))
+
+
 <a name="v2.52.2"></a>
 ### v2.52.2 (2020-04-16)
 

data/README.md

@@ -64,8 +64,6 @@ If you don't have a [Pact Broker CI Nerf Gun][nerf], you'll probably want to rea
 
 #### Step 3. Back to the Consumer CI build
 
-The following funcationality is in beta release. Your feedback would be appreciated.
-
 1. The Consumer CI determines if the pact has been verified by running `pact-broker can-i-deploy --pacticipant CONSUMER_NAME --version CONSUMER_VERSION ...` (see documentation [here](https://github.com/pact-foundation/pact_broker-client#can-i-deploy))
 1. If the pact has been verified, the deployment can proceed.
 
@@ -123,8 +121,8 @@ Use the HAL browser to view documentation as you browse.
     * unix users just use your package manager
 * Run `git clone git@github.com:pact-foundation/pact_broker.git && cd pact_broker/example`
 * Run `bundle install`
-* Run `bundle exec rackup -p 8080` (this will use a Sqlite database. If you want to try it out with a Postgres database, see the [README](https://github.com/pact-foundation/pact_broker/tree/master/example) in the example directory.)
-* Open [http://localhost:8080](http://localhost:8080) and you should see a list containing the pact between the Zoo App and the Animal Service.
+* Run `bundle exec rackup -p 9292 -o 0.0.0.0` (this will use a Sqlite database. If you want to try it out with a Postgres database, see the [README](https://github.com/pact-foundation/pact_broker/tree/master/example) in the example directory.)
+* Open [http://localhost:9292](http://localhost:9292) and you should see a list containing the pact between the Zoo App and the Animal Service.
 * Click on the arrow to see the generated HTML documentation.
 * Click on either service to see an autogenerated network diagram.
 * Click on the HAL Browser link to have a poke around the API.

data/lib/pact_broker/api.rb

@@ -3,6 +3,14 @@ require 'webmachine/rack_adapter_monkey_patch'
 require 'pact_broker/api/resources'
 require 'pact_broker/feature_toggle'
 
+module Webmachine
+  class Request
+    def patch?
+      method == "PATCH"
+    end
+  end
+end
+
 module PactBroker
 
   API ||= begin

data/lib/pact_broker/api/decorators/decorator_context.rb

@@ -1,20 +1,15 @@
 module PactBroker
   module Api
     module Decorators
-
       class DecoratorContext < Hash
 
-        attr_reader :base_url, :resource_url, :resource_title
+        attr_reader :base_url, :resource_url, :resource_title, :env
 
-        def initialize base_url, resource_url, options = {}
-          @base_url = base_url
-          self[:base_url] = base_url
-          @resource_url = resource_url
-          self[:resource_url] = resource_url
-          if options[:resource_title]
-            @resource_title = options[:resource_title]
-            self[:resource_title] = resource_title
-          end
+        def initialize base_url, resource_url, env, options = {}
+          @base_url = self[:base_url] = base_url
+          @resource_url = self[:resource_url]= resource_url
+          @resource_title = self[:resource_title] = options[:resource_title]
+          @env = self[:env] = env
           merge!(options)
         end
 

data/lib/pact_broker/api/decorators/webhook_execution_result_decorator.rb

@@ -78,8 +78,13 @@ module PactBroker
           }
         end
 
+        def to_hash(options)
+          @to_hash_options = options
+          super
+        end
+
         def response_hidden_message
-          PactBroker::Messages.message('messages.response_body_hidden')
+          PactBroker::Messages.message('messages.response_body_hidden', base_url: @to_hash_options[:user_options][:base_url])
         end
       end
     end

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -253,6 +253,10 @@ module PactBroker
         "/matrix/provider/#{url_encode(provider_name)}/consumer/#{url_encode(consumer_name)}"
       end
 
+      def matrix_badge_url_for_selectors consumer_selector, provider_selector, base_url = ''
+        "#{base_url}/matrix/provider/#{url_encode(provider_selector.pacticipant_name)}/latest/#{url_encode(provider_selector.tag)}/consumer/#{url_encode(consumer_selector.pacticipant_name)}/latest/#{url_encode(consumer_selector.tag)}/badge.svg"
+      end
+
       def matrix_for_pacticipant_version_url(version, base_url = '')
         query = {
           q: [{ pacticipant: version.pacticipant.name, version: version.number }],

data/lib/pact_broker/api/resources/badge.rb

@@ -34,12 +34,12 @@ module PactBroker
 
         def to_svg
           response.headers['Cache-Control'] = 'no-cache'
-          comment + badge_service.pact_verification_badge(pact, label, initials, pseudo_branch_verification_status)
+          comment + badge_service.pact_verification_badge(pact, label, initials, pseudo_branch_verification_status, tags)
         end
 
         def moved_temporarily?
           response.headers['Cache-Control'] = 'no-cache'
-          badge_service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status)
+          badge_service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status, tags)
         end
 
         private
@@ -72,6 +72,10 @@ module PactBroker
           verification_number =  latest_verification ? latest_verification.number : "?"
           "<!-- #{identifier_from_path[:consumer_name]} version #{consumer_version_number} revision #{pact_revision} #{identifier_from_path[:provider_name]} version #{provider_version_number} number #{verification_number} -->\n"
         end
+
+        def tags
+          {}
+        end
       end
     end
   end

data/lib/pact_broker/api/resources/base_resource.rb

@@ -33,8 +33,8 @@ module PactBroker
           { 'Access-Control-Allow-Methods' => allowed_methods.join(", ")}
         end
 
-        def update_matrix_after_request?
-          false
+        def known_methods
+          super + ['PATCH']
         end
 
         def finish_request
@@ -76,7 +76,7 @@ module PactBroker
         end
 
         def decorator_context options = {}
-          Decorators::DecoratorContext.new(base_url, resource_url, options)
+          Decorators::DecoratorContext.new(base_url, resource_url, request.env, options)
         end
 
         def handle_exception e

data/lib/pact_broker/api/resources/matrix_badge.rb

@@ -7,7 +7,12 @@ module PactBroker
 
         private
 
+        def tags
+          { consumer_tag: identifier_from_path[:tag], provider_tag: identifier_from_path[:provider_tag] }
+        end
+
         def latest_verification
+          return nil unless pact
           @latest_verification ||= verification_service.find_latest_verification_for_tags(
             identifier_from_path[:consumer_name],
             identifier_from_path[:provider_name],

data/lib/pact_broker/api/resources/pact.rb

@@ -9,14 +9,6 @@ require 'pact_broker/api/contracts/put_pact_params_contract'
 require 'pact_broker/webhooks/execution_configuration'
 require 'pact_broker/api/resources/webhook_execution_methods'
 
-module Webmachine
-  class Request
-    def patch?
-      method == "PATCH"
-    end
-  end
-end
-
 module PactBroker
   module Api
     module Resources
@@ -41,10 +33,6 @@ module PactBroker
           ["GET", "PUT", "DELETE", "PATCH", "OPTIONS"]
         end
 
-        def known_methods
-          super + ['PATCH']
-        end
-
         def is_conflict?
           merge_conflict = request.patch? && resource_exists? &&
             Pacts::Merger.conflict?(pact.json_content, pact_params.json_content)
@@ -110,10 +98,6 @@ module PactBroker
           @pact_params ||= PactBroker::Pacts::PactParams.from_request request, path_info
         end
 
-        def update_matrix_after_request?
-          request.put? || request.patch?
-        end
-
         def set_post_deletion_response
           latest_pact = pact_service.find_latest_pact(pact_params)
           response_body = { "_links" => {} }

data/lib/pact_broker/api/resources/pacticipant.rb

@@ -62,10 +62,6 @@ module PactBroker
         def pacticipant_name
           identifier_from_path[:pacticipant_name]
         end
-
-        def update_matrix_after_request?
-          request.patch?
-        end
       end
     end
   end

data/lib/pact_broker/api/resources/verifications.rb

@@ -67,10 +67,6 @@ module PactBroker
           PactBroker::Api::Decorators::VerificationDecorator.new(model)
         end
 
-        def update_matrix_after_request?
-          request.post?
-        end
-
         def metadata
           PactBrokerUrls.decode_webhook_metadata(identifier_from_path[:metadata])
         end

data/lib/pact_broker/badges/service.rb

@@ -19,14 +19,14 @@ module PactBroker
         PactBroker.configuration.badge_provider_mode == :redirect && !!PactBroker.configuration.shields_io_base_url
       end
 
-      def pact_verification_badge pact, label, initials, pseudo_branch_verification_status
+      def pact_verification_badge pact, label, initials, pseudo_branch_verification_status, metadata = {}
         return static_svg(pact, pseudo_branch_verification_status) unless pact
 
-        dynamic_svg(pact, label, initials, pseudo_branch_verification_status) || static_svg(pact, pseudo_branch_verification_status)
+        dynamic_svg(pact, label, initials, pseudo_branch_verification_status, metadata) || static_svg(pact, pseudo_branch_verification_status)
       end
 
-      def pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status)
-        title = badge_title(pact, label, initials)
+      def pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status, metadata = {})
+        title = badge_title(pact, label, initials, metadata)
         status = badge_status(pseudo_branch_verification_status)
         color = badge_color(pseudo_branch_verification_status)
         build_shield_io_uri(title, status, color)
@@ -38,23 +38,26 @@ module PactBroker
 
       private
 
-      def badge_title pact, label, initials
+      def badge_title pact, label, initials, metadata
         return 'pact not found' if pact.nil?
+        consumer_name = prepare_name(pact.consumer_name, initials, metadata[:consumer_tag])
+        provider_name = prepare_name(pact.provider_name, initials, metadata[:provider_tag])
         title = case (label || '').downcase
-          when 'consumer' then prepare_name(pact.consumer_name, initials)
-          when 'provider' then prepare_name(pact.provider_name, initials)
-          else "#{prepare_name(pact.consumer_name, initials)}%2F#{prepare_name(pact.provider_name, initials)}"
+          when 'consumer' then consumer_name
+          when 'provider' then provider_name
+          else "#{consumer_name}%2F#{provider_name}"
         end
         "#{title} pact".downcase
       end
 
-      def prepare_name name, initials
+      def prepare_name name, initials, tag = nil
+        tag_suffix = tag ? " (#{tag})" : ''
         if initials
           parts = split_space_dash_underscore(name)
           parts = split_camel_case(name) if parts.size == 1
-          return parts.collect{ |p| p[0] }.join.downcase if parts.size > 1
+          return parts.collect{ |p| p[0] }.join.downcase + tag_suffix if parts.size > 1
         end
-        name.downcase
+        name.downcase + tag_suffix
       end
 
       def split_space_dash_underscore name
@@ -86,9 +89,9 @@ module PactBroker
         end
       end
 
-      def dynamic_svg pact, label, initials, pseudo_branch_verification_status
+      def dynamic_svg pact, label, initials, pseudo_branch_verification_status, metadata
         return nil unless PactBroker.configuration.shields_io_base_url
-        uri = pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status)
+        uri = pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status, metadata)
         begin
           response = do_request(uri)
           response.code == '200' ? response.body : nil

data/lib/pact_broker/locale/en.yml

@@ -12,7 +12,7 @@ en:
 
   pact_broker:
     messages:
-      response_body_hidden: For security purposes, the response details are not logged. To enable response logging, configure the webhook_host_whitelist property. See /doc/webhooks#whitelist for more information.
+      response_body_hidden: For security purposes, the response details are not logged. To enable response logging, configure the webhook_host_whitelist property. See %{base_url}/doc/webhooks#whitelist for more information.
       matrix:
         pre_verified: This pact was "pre-verified" as it has identical content to a previously verified pact.
       webhooks:

data/lib/pact_broker/matrix/unresolved_selector.rb

@@ -48,6 +48,10 @@ module PactBroker
       def max_age
         self[:max_age]
       end
+
+      def latest_for_pacticipant_and_tag?
+        !!(pacticipant_name && tag && latest)
+      end
     end
   end
 end

data/lib/pact_broker/pacticipants/repository.rb

@@ -15,6 +15,12 @@ module PactBroker
         pacticipants.first
       end
 
+      def find_by_name! name
+        pacticipant = find_by_name(name)
+        raise PactBroker::Error, "No pacticipant found with name '#{name}'" unless pacticipant
+        pacticipant
+      end
+
       def find_by_id id
         PactBroker::Domain::Pacticipant.where(id: id).single_record
       end

data/lib/pact_broker/pacticipants/service.rb

@@ -40,6 +40,14 @@ module PactBroker
         pacticipant_repository.find_by_name(name)
       end
 
+      def self.find_pacticipant_by_name! name
+        pacticipant_repository.find_by_name!(name)
+      end
+
+      def self.find_by_id id
+        pacticipant_repository.find_by_id(id)
+      end
+
       def self.find options
         pacticipant_repository.find options
       end

data/lib/pact_broker/pacts/repository.rb

@@ -202,6 +202,7 @@ module PactBroker
           .all
 
         wip_pacts.collect do | pact|
+
           pending_tag_names = find_provider_tags_for_which_pact_publication_id_is_pending(pact, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
           pre_existing_tag_names = find_provider_tag_names_that_were_first_used_before_pact_published(pact, provider_tag_collection)
 
@@ -356,12 +357,11 @@ module PactBroker
         selected_pacts = selected_pacts + find_pacts_for_fallback_tags(selected_pacts, provider_name, consumer_version_selectors)
 
         selected_pacts
-          .group_by(&:pact_version_sha)
+          .group_by{ |p| [p.consumer_name, p.pact_version_sha] }
           .values
           .collect do | selected_pacts_for_pact_version_id |
             SelectedPact.merge(selected_pacts_for_pact_version_id)
           end
-
       end
 
       private
@@ -562,6 +562,7 @@ module PactBroker
             .join(:verifications, verifications_join)
             .join(:tags, tags_join, { table_alias: :provider_tags } )
             .where(Sequel[:latest_tagged_pact_publications][:provider_id] => provider_id)
+            .distinct
             .all
           hash[provider_tag] = head_pacts
         end

data/lib/pact_broker/ui/controllers/base_controller.rb

@@ -11,6 +11,9 @@ module PactBroker
         set :show_exceptions, ENV['RACK_ENV'] != 'production'
         set :dump_errors, false # The padrino logger logs these for us. If this is enabled we get duplicate logging.
 
+        def base_url
+          PactBroker.configuration.base_url || request.base_url
+        end
       end
     end
   end

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -3,6 +3,8 @@ require 'pact_broker/ui/view_models/matrix_lines'
 require 'pact_broker/matrix/unresolved_selector'
 require 'pact_broker/matrix/parse_query'
 require 'pact_broker/logging'
+require 'pact_broker/api/pact_broker_urls'
+
 require 'haml'
 
 module PactBroker
@@ -30,6 +32,7 @@ module PactBroker
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
                 locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
+                locals[:badge_url] = matrix_badge_url(selectors, lines)
               else
                 locals[:errors] = errors
               end
@@ -52,7 +55,8 @@ module PactBroker
             consumer_name: params[:consumer_name],
             provider_name: params[:provider_name],
             selectors: create_selector_objects(selectors),
-            options: create_options_model(options)
+            options: create_options_model(options),
+            badge_url: nil
           }
           haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
         end
@@ -76,6 +80,16 @@ module PactBroker
           o.all_rows_checked = o.latestby.nil? ? 'checked' : nil
           o
         end
+
+        def matrix_badge_url(selectors, lines)
+          if lines.any? && selectors.size == 2 && selectors.all?{ | selector| selector.latest_for_pacticipant_and_tag? }
+            consumer_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.consumer_name }
+            provider_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.provider_name }
+            if consumer_selector && provider_selector
+              PactBroker::Api::PactBrokerUrls.matrix_badge_url_for_selectors(consumer_selector, provider_selector, base_url)
+            end
+          end
+        end
       end
     end
   end

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

@@ -14,18 +14,21 @@
         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()'}
       - 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)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.52.2'
+  VERSION = '2.53.0'
 end

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/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/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/integration/ui/matrix_spec.rb

@@ -6,10 +6,9 @@ describe "UI matrix" do
   let(:params) { {} }
 
   before do
-    td.create_pact_with_hierarchy("Foo", "1", "Bar")
-      .create_consumer_version_tag("prod")
-      .create_consumer_version("2")
-      .create_pact
+    td.create_pact_with_verification("Foo", "1", "Bar", "2")
+      .create_consumer_version_tag("ctag")
+      .create_provider_version_tag("ptag")
   end
 
   subject { get("/matrix/provider/Bar/consumer/Foo") }
@@ -27,4 +26,12 @@ describe "UI matrix" do
       expect(subject.body.scan('<tr').to_a.count).to be > 1
     end
   end
+
+  describe "with query params, for the latest tagged versions of two pacticipants" do
+    subject { get("/matrix?q%5B%5Dpacticipant=Foo&q%5B%5Dtag=ctag&q%5B%5Dlatest=true&q%5B%5Dpacticipant=Bar&q%5B%5Dtag=ptag&q%5B%5Dlatest=true&latestby=cvpv&limit=100") }
+
+    it "returns a page with a badge" do
+      expect(subject.body).to include "http://example.org/matrix/provider/Bar/latest/ptag/consumer/Foo/latest/ctag/badge.svg"
+    end
+  end
 end

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

@@ -28,7 +28,7 @@ module PactBroker
         let(:consumer) { instance_double(PactBroker::Domain::Pacticipant, name: 'Consumer')}
         let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: 'Provider')}
         let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: '1234', pacticipant: consumer)}
-        let(:decorator_context) { DecoratorContext.new(base_url, '') }
+        let(:decorator_context) { DecoratorContext.new(base_url, '', {}) }
 
         let(:json) { PactVersionDecorator.new(pact).to_json(user_options: decorator_context) }
 

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

@@ -17,7 +17,7 @@ module PactBroker
         let(:resource_url) { 'http://example.org/webhooks' }
 
         let(:decorator_context) do
-          DecoratorContext.new(base_url, resource_url, resource_title: 'Title')
+          DecoratorContext.new(base_url, resource_url, {}, resource_title: 'Title')
         end
 
         let(:webhooks) { [webhook] }

data/spec/lib/pact_broker/api/pact_broker_urls_spec.rb

@@ -138,6 +138,14 @@ module PactBroker
 
         it { is_expected.to eq "http://example.org/matrix?q[][pacticipant]=Foo%2FFoo&q[][version]=2&latestby=cvpv" }
       end
+
+      describe "matrix_badge_url" do
+        subject { PactBrokerUrls.matrix_badge_url_for_selectors(consumer_selector, provider_selector, base_url) }
+        let(:provider_selector) { PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: provider_name, tag: "meep", latest: true) }
+        let(:consumer_selector) { PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: consumer_name, tag: "bar", latest: true) }
+
+        it { is_expected.to eq "http://example.org/matrix/provider/Bar%2FBar/latest/meep/consumer/Foo%2FFoo/latest/bar/badge.svg" }
+      end
     end
   end
 end

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

@@ -63,6 +63,15 @@ module PactBroker
             subject
           end
 
+          context "when the pact is not found" do
+            let(:pact) { nil }
+
+            it "does not retrieve the latest verification" do
+              expect(PactBroker::Verifications::Service).to_not receive(:find_latest_verification_for)
+              subject
+            end
+          end
+
           it "determines the pact's verification status based on the latest pact and latest verification" do
             expect(PactBroker::Verifications::PseudoBranchStatus).to receive(:new).with(pact, verification)
             subject
@@ -74,7 +83,7 @@ module PactBroker
             end
 
             it "creates a badge" do
-              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(pact, nil, false, :verified)
+              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(pact, nil, false, :verified, {})
               subject
             end
 
@@ -101,7 +110,7 @@ module PactBroker
             end
 
             it "determines the URL of the badge to redirect to" do
-              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge_url).with(pact, nil, false, :verified)
+              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge_url).with(pact, nil, false, :verified, {})
               subject
             end
 
@@ -116,7 +125,7 @@ module PactBroker
             let(:params) { {label: 'consumer'} }
 
             it "creates a badge with the specified label" do
-              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(anything, 'consumer', anything, anything)
+              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(anything, 'consumer', anything, anything, {})
               subject
             end
           end
@@ -125,7 +134,7 @@ module PactBroker
             let(:params) { {initials: 'true'} }
 
             it "creates a badge with initials" do
-              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(anything, anything, true, anything)
+              expect(PactBroker::Badges::Service).to receive(:pact_verification_badge).with(anything, anything, true, anything, {})
               subject
             end
           end
@@ -156,32 +165,43 @@ module PactBroker
             let(:path) { "/matrix/provider/provider/latest/master/consumer/consumer/latest/prod/badge" }
             let(:row) { { consumer_name: 'consumer', provider_name: 'provider' } }
 
-            it "looks up the verification" do
-              expect(PactBroker::Verifications::Service).to receive(:find_latest_verification_for_tags) do | consumer, provider, tag|
-                expect(consumer.name).to eq 'consumer'
-                expect(provider.name).to eq 'provider'
-                expect(tag).to eq 'prod'
+            context "when a pact is found" do
+              it "looks up the verification" do
+                expect(PactBroker::Verifications::Service).to receive(:find_latest_verification_for_tags) do | consumer, provider, tag|
+                  expect(consumer.name).to eq 'consumer'
+                  expect(provider.name).to eq 'provider'
+                  expect(tag).to eq 'prod'
+                end
+                subject
               end
-              subject
-            end
 
-            context "when a verification is found" do
-              before do
-                allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for_tags).and_return(verification)
+              context "when a verification is found" do
+                before do
+                  allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for_tags).and_return(verification)
+                end
+
+                it "returns the badge" do
+                  expect(subject.body).to end_with "badge"
+                end
               end
 
-              it "returns the badge" do
-                expect(subject.body).to end_with "badge"
+              context "when a verification is not found" do
+                before do
+                  allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for_tags).and_return(nil)
+                end
+
+                it "returns the badge" do
+                  expect(subject.body).to end_with "badge"
+                end
               end
             end
 
-            context "when a verification is not found" do
-              before do
-                allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for_tags).and_return(nil)
-              end
+            context "when a pact is not found" do
+              let(:pact) { nil }
 
-              it "returns the badge" do
-                expect(subject.body).to end_with "badge"
+              it "does not look up the verification" do
+                expect(PactBroker::Verifications::Service).to_not receive(:find_latest_verification_for_tags)
+                subject
               end
             end
           end

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

@@ -60,7 +60,7 @@ module PactBroker
 
               it "generates a JSON response body for the execution result" do
                 allow(PactBroker.configuration).to receive(:show_webhook_response?).and_return('foo')
-                expect(decorator).to receive(:to_json).with(user_options: expected_user_options)
+                expect(decorator).to receive(:to_json).with(user_options: hash_including(expected_user_options))
                 subject
               end
 

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

@@ -18,10 +18,11 @@ module PactBroker
       let!(:http_request) do
         stub_request(:get, expected_url).to_return(:status => response_status, :body => "svg")
       end
+      let(:tags) { {} }
 
-      subject { PactBroker::Badges::Service.pact_verification_badge pact, label, initials, pseudo_branch_verification_status }
+      subject { PactBroker::Badges::Service.pact_verification_badge(pact, label, initials, pseudo_branch_verification_status, tags) }
 
-      let(:pact_verification_badge_url) { PactBroker::Badges::Service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status) }
+      let(:pact_verification_badge_url) { PactBroker::Badges::Service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status, tags) }
 
       before do
         Service.clear_cache
@@ -43,7 +44,6 @@ module PactBroker
       end
 
       describe "#pact_verification_badge" do
-
         it "returns the svg file" do
            expect(subject).to eq "svg"
         end
@@ -107,6 +107,18 @@ module PactBroker
               expect(pact_verification_badge_url).to eq URI(expected_url)
             end
           end
+
+          context "when the tags are supplied" do
+            let(:tags) { { consumer_tag: "prod", provider_tag: "master" } }
+
+            let(:expected_left_text) { "foo--bar%20(prod)%2fthing__blah%20(master)%20pact" }
+
+            it "creates a badge with the consumer and provider names, not initials" do
+              subject
+              expect(http_request).to have_been_made
+              expect(pact_verification_badge_url).to eq URI(expected_url)
+            end
+          end
         end
 
         context "when label is consumer" do

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         def version_numbers
-          subject.collect(&:number)
+          subject.collect(&:number).sort_by(&:to_i)
         end
 
         context "when selecting the latest prod versions without a pacticipant name" do
@@ -63,7 +63,7 @@ module PactBroker
           let(:selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: 'prod') }
 
           it "selects all the production versions without a pacticipant name" do
-            expect(version_numbers.sort).to eq %w{1 10 11 2}
+            expect(version_numbers).to eq %w{1 2 10 11}
           end
         end
 
@@ -82,14 +82,14 @@ module PactBroker
           let(:selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: true, latest: true) }
 
           it "selects the head versions for each tag" do
-            expect(version_numbers.sort).to eq %w{11 2 4}
+            expect(version_numbers).to eq %w{2 4 11}
           end
 
           context "when also specifying pacticipant name" do
             let(:selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: true, latest: true, pacticipant_name: "Foo") }
 
             it "selects the head versions for each tag for the given pacticipant" do
-              expect(version_numbers.sort).to eq %w{2 4}
+              expect(version_numbers).to eq %w{2 4}
             end
           end
         end
@@ -109,14 +109,14 @@ module PactBroker
           let(:selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: true) }
 
           it "selects every version with a tag" do
-            expect(version_numbers.sort).to eq %w{1 10 2 4}
+            expect(version_numbers).to eq %w{1 2 4 10}
           end
 
           context "when also specifying pacticipant name" do
             let(:selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: true, pacticipant_name: "Foo") }
 
             it "selects every version with a tag for the given pacticipant" do
-              expect(version_numbers.sort).to eq %w{1 2 4}
+              expect(version_numbers).to eq %w{1 2 4}
             end
           end
         end
@@ -137,7 +137,7 @@ module PactBroker
           let(:four_days_ago) { Date.today - 4 }
 
           it "selects the consumer versions younger than the max age" do
-            expect(version_numbers.sort).to eq %w{2 3}
+            expect(version_numbers).to eq %w{2 3}
           end
         end
       end

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

@@ -6,7 +6,6 @@ module PactBroker
       let(:td) { TestDataBuilder.new }
 
       describe "#find_for_verification" do
-
         def find_by_consumer_version_number(consumer_version_number)
           subject.find{ |pact| pact.consumer_version_number == consumer_version_number }
         end
@@ -189,6 +188,24 @@ module PactBroker
             expect(find_by_consumer_version_number("foo-latest-dev-version").overall_latest?).to be true
           end
         end
+
+        context "when two consumers have exactly the same json content" do
+          before do
+            td.create_consumer
+              .create_provider("Bar")
+              .create_consumer_version
+              .create_pact(json_content: { interactions: ['foo'] }.to_json )
+              .create_consumer
+              .create_consumer_version
+              .create_pact(json_content: { interactions: ['foo'] }.to_json )
+          end
+
+          let(:consumer_version_selectors) { Selectors.new }
+
+          it "returns a pact for each consumer" do
+            expect(subject.size).to eq 2
+          end
+        end
       end
     end
   end

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

@@ -295,6 +295,26 @@ module PactBroker
             expect(subject.number).to eq 2
           end
         end
+
+        context "when the consumer does not exist" do
+          subject { Repository.new.find_latest_verification_for_tags("Foo", "Bar", "feat-x", "feat-y") }
+
+          it "raises an error" do
+            expect{ subject }.to raise_error PactBroker::Error, /Foo/
+          end
+        end
+
+        context "when the provider does not exist" do
+          before do
+            td.create_consumer("Foo")
+          end
+
+          subject { Repository.new.find_latest_verification_for_tags("Foo", "Bar", "feat-x", "feat-y") }
+
+          it "raises an error" do
+            expect{ subject }.to raise_error PactBroker::Error, /Bar/
+          end
+        end
       end
 
       describe "delete_by_provider_version_id" do

data/spec/lib/pact_broker/webhooks/webhook_request_logger_spec.rb

@@ -50,7 +50,8 @@ module PactBroker
         }
       end
 
-      let(:webhook_context) { { consumer_version_number: "123" } }
+      let(:base_url) { "http://example.org" }
+      let(:webhook_context) { { consumer_version_number: "123", base_url: base_url } }
 
       let(:webhook_request_logger) { WebhookRequestLogger.new(options) }
 
@@ -117,6 +118,7 @@ module PactBroker
           end
 
           it "logs a message about why the response is hidden" do
+            expect(logs).to include base_url
             expect(logs).to include "security purposes"
           end
         end
@@ -192,6 +194,7 @@ module PactBroker
             end
 
             it "logs a message about why the response is hidden" do
+              expect(logs).to include base_url
               expect(logs).to include "security purposes"
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.52.2
+  version: 2.53.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -128,42 +128,42 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.2
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.2
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
@@ -188,22 +188,22 @@ dependencies:
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.3
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.3
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -1126,7 +1126,6 @@ files:
 - lib/pact_broker/ui/views/index/show.haml
 - lib/pact_broker/ui/views/layouts/main.haml
 - lib/pact_broker/ui/views/matrix/show.haml
-- lib/pact_broker/verifications/all_verifications.rb
 - lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb
 - lib/pact_broker/verifications/latest_verification_for_consumer_version_tag.rb
 - lib/pact_broker/verifications/latest_verification_for_pact_version.rb
@@ -1641,7 +1640,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: See description

data/lib/pact_broker/verifications/all_verifications.rb

@@ -1,41 +0,0 @@
-require 'pact_broker/domain/verification'
-
-module PactBroker
-  module Verifications
-    include PactBroker::Repositories::Helpers
-
-    class AllVerifications < PactBroker::Domain::Verification
-      set_dataset(:all_verifications)
-    end
-
-    # this view doesn't have a consumer_id
-    # TODO add it
-    def consumer
-      PactBroker::Domain::Pacticipant.find(id: PactBroker::Pacts::AllPactPublications
-         .where(pact_version_id: pact_version_id)
-         .limit(1).select(:consumer_id))
-    end
-
-    # this view doesn't have a provider_id
-    # TODO add it
-    def provider
-      PactBroker::Domain::Pacticipant.find(id: PactBroker::Pacts::AllPactPublications
-         .where(pact_version_id: pact_version_id)
-         .limit(1).select(:provider_id))
-    end
-  end
-end
-
-# Table: all_verifications
-# Columns:
-#  id                      | integer                     |
-#  number                  | integer                     |
-#  success                 | boolean                     |
-#  provider_version_id     | integer                     |
-#  provider_version_number | text                        |
-#  provider_version_order  | integer                     |
-#  build_url               | text                        |
-#  pact_version_id         | integer                     |
-#  execution_date          | timestamp without time zone |
-#  created_at              | timestamp without time zone |
-#  test_results            | text                        |