pact_broker 2.55.0 → 2.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a4ca507c57031ed0e5aa7f988f4a0826bd97c2d8904431da26052fb6884558
-  data.tar.gz: e700fab3146413a638120a9d73655ee5b6ae8393932223654091588e1682798c
+  metadata.gz: f4391656ae9cddad910749af5c6bb4c3c94644cf605122e31a40ce8891feb49d
+  data.tar.gz: db46a7cdf21674996ed6271dac6c13e2238771004d76693fea6bc11e18fdd146
 SHA512:
-  metadata.gz: e4d48c58ceb23d1b20dfdd3e263d52c69e30355c72bc27e00795c0b11a2a56b5c9bf52034b2f0e8d2dd2d09480ac7e6a5ae474d34457de7653e381fd6518e62c
-  data.tar.gz: e454fa82a641873ae68221190d91c84830aa0def182d6637fca1a34a9a1aecf64a4f165221283d5850deaef1a2d5580610b0ca214b6b2885b6ebe14bdc56250e
+  metadata.gz: 77ebcb58e85910f527b5750b4a484d856cb7a84369e4d6dc89097e3cc706c8077e1f2cc83ff8f7c5e1e079eb55b686680cacccb52c79a20a6b42b903d98e8784
+  data.tar.gz: c151197191dab0a0b35dd08f7ec0df10a280f28f372a5d72365052a813b67265a2cd1e3d602927641169b5e72fd9e1b6547c0e04a260895693c6a65415fcace0

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+<a name="v2.56.0"></a>
+### v2.56.0 (2020-06-01)
+
+
+#### Features
+
+* **database**
+  * log schema versions and migration info on startup	 ([b385e535](/../../commit/b385e535))
+  * allow options to be passed to Sequel migrate via the MigrationTask	 ([143613e7](/../../commit/143613e7))
+
+* allow Pactflow messages in logs to be hidden by setting PACT_BROKER_HIDE_PACTFLOW_MESSAGES=true	 ([a7550105](/../../commit/a7550105))
+
+* **can-i-deploy**
+  * experimental - add a warning message if there are interactions missing verification test results.	 ([f7ab8cc5](/../../commit/f7ab8cc5))
+
+
+#### Bug Fixes
+
+* use relative URLs when base_url not explictly set to ensure app is not vulnerable to host header attacks	 ([92c45a0a](/../../commit/92c45a0a))
+* raise PactBroker::Error when either pacticipant is not found in the business layer while attempting to delete an integration	 ([3c209a46](/../../commit/3c209a46))
+
+
 <a name="v2.55.0"></a>
 ### v2.55.0 (2020-05-22)
 

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

@@ -22,6 +22,11 @@ module PactBroker
             "There are no missing dependencies"
           when PactBroker::Matrix::Successful
             "All required verification results are published and successful"
+          when PactBroker::Matrix::InteractionsMissingVerifications
+            descriptions = reason.interactions.collect do | interaction |
+              interaction_description(interaction)
+            end.join('; ')
+            "WARNING: Although the verification was reported as successful, the results for #{reason.consumer_selector.description} and #{reason.provider_selector.description} may be missing tests for the following interactions: #{descriptions}"
           else
             reason
           end
@@ -44,6 +49,18 @@ module PactBroker
             ""
           end
         end
+
+        # TODO move this somewhere else
+        def interaction_description(interaction)
+          if interaction['providerState'] && interaction['providerState'] != ''
+            "#{interaction['description']} given #{interaction['providerState']}"
+          elsif interaction['providerStates'] && interaction['providerStates'].is_a?(Array) && interaction['providerStates'].any?
+            provider_states = interaction['providerStates'].collect{ |ps| ps['name'] }.compact.join(', ')
+            "#{interaction['description']} given #{provider_states}"
+          else
+            interaction['description']
+          end
+        end
       end
     end
   end

data/lib/pact_broker/app.rb

@@ -81,11 +81,18 @@ module PactBroker
     end
 
     def prepare_database
+      logger.info "Database schema version is #{PactBroker::DB.version(configuration.database_connection)}"
       if configuration.auto_migrate_db
-        logger.info "Migrating database"
-        PactBroker::DB.run_migrations configuration.database_connection, allow_missing_migration_files: configuration.allow_missing_migration_files
+        migration_options = { allow_missing_migration_files: configuration.allow_missing_migration_files }
+        if PactBroker::DB.is_current?(configuration.database_connection, migration_options)
+          logger.info "Skipping database migrations as the latest migration has already been applied"
+        else
+          logger.info "Migrating database schema"
+          PactBroker::DB.run_migrations configuration.database_connection, migration_options
+          logger.info "Database schema version is now #{PactBroker::DB.version(configuration.database_connection)}"
+        end
       else
-        logger.info "Skipping database migrations"
+        logger.info "Skipping database schema migrations as database auto migrate is disabled"
       end
 
       if configuration.auto_migrate_db_data
@@ -232,7 +239,9 @@ module PactBroker
     end
 
     def print_startup_message
-      logger.info "\n\n#{'*' * 80}\n\nWant someone to manage your Pact Broker for you? Check out https://pactflow.io/oss for a hardened, fully supported SaaS version of the Pact Broker with an improved UI + more.\n\n#{'*' * 80}\n"
+      if ENV['PACT_BROKER_HIDE_PACTFLOW_MESSAGES'] != 'true'
+        logger.info "\n\n#{'*' * 80}\n\nWant someone to manage your Pact Broker for you? Check out https://pactflow.io/oss for a hardened, fully supported SaaS version of the Pact Broker with an improved UI + more.\n\n#{'*' * 80}\n"
+      end
     end
   end
 end

data/lib/pact_broker/db.rb

@@ -2,12 +2,12 @@ require 'sequel'
 require 'pact_broker/db/validate_encoding'
 require 'pact_broker/db/migrate'
 require 'pact_broker/db/migrate_data'
+require 'pact_broker/db/version'
 
 Sequel.datetime_class = DateTime
 
 module PactBroker
   module DB
-
     MIGRATIONS_DIR = File.expand_path("../../../db/migrations", __FILE__)
 
     def self.connection= connection
@@ -27,6 +27,14 @@ module PactBroker
       PactBroker::DB::MigrateData.(database_connection)
     end
 
+    def self.is_current? database_connection, options = {}
+      Sequel::TimestampMigrator.is_current?(database_connection, PactBroker::DB::MIGRATIONS_DIR, options)
+    end
+
+    def self.version database_connection
+      PactBroker::DB::Version.call(database_connection)
+    end
+
     def self.validate_connection_config
       PactBroker::DB::ValidateEncoding.(connection)
     end

data/lib/pact_broker/doc/controllers/app.rb

@@ -46,7 +46,11 @@ module PactBroker
         private
 
         def base_url
-          PactBroker.configuration.base_url || request.base_url
+          # Using the X-Forwarded headers in the UI can leave the app vulnerable
+          # https://www.acunetix.com/blog/articles/automated-detection-of-host-header-attacks/
+          # Either use the explicitly configured base url or an empty string,
+          # rather than request.base_url, which uses the X-Forwarded headers.
+          PactBroker.configuration.base_url || ''
         end
       end
     end

data/lib/pact_broker/domain/verification.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'sequel'
 require 'pact_broker/repositories/helpers'
 require 'pact_broker/tags/tag_with_latest_flag'
+require 'pact_broker/pacts/content'
 
 
 module PactBroker
@@ -83,6 +84,18 @@ module PactBroker
       def latest_pact_publication
         pact_version.latest_pact_publication
       end
+
+      def interactions_missing_test_results
+        @interactions_missing_test_results ||= pact_content_with_test_results.interactions_missing_test_results
+      end
+
+      def all_interactions_missing_test_results?
+        pact_content_with_test_results.interactions.count == pact_content_with_test_results.interactions_missing_test_results.count
+      end
+
+      def pact_content_with_test_results
+        @pact_content_with_test_results = PactBroker::Pacts::Content.from_json(pact_version.content).with_test_results(test_results)
+      end
     end
 
     Verification.plugin :timestamps

data/lib/pact_broker/integrations/service.rb

@@ -31,8 +31,8 @@ module PactBroker
       end
 
       def self.delete(consumer_name, provider_name)
-        consumer = pacticipant_service.find_pacticipant_by_name(consumer_name)
-        provider = pacticipant_service.find_pacticipant_by_name(provider_name)
+        consumer = pacticipant_service.find_pacticipant_by_name!(consumer_name)
+        provider = pacticipant_service.find_pacticipant_by_name!(provider_name)
         # this takes care of the triggered webhooks and webhook executions
         pact_service.delete_all_pact_publications_between(consumer_name, and: provider_name)
         verification_service.delete_all_verifications_between(consumer_name, and: provider_name)

data/lib/pact_broker/logging.rb

@@ -34,7 +34,9 @@ module PactBroker
       message = "#{e.class} #{e.message}\n#{e.backtrace.join("\n")}"
       message = "#{description} - #{message}" if description
       logger.error message
-      logger.info "\n\n#{'*' * 80}\n\nPrefer it was someone else's job to deal with this error? Check out https://pactflow.io/oss for a hardened, fully supported SaaS version of the Pact Broker with an improved UI  + more.\n\n#{'*' * 80}\n"
+      if ENV['PACT_BROKER_HIDE_PACTFLOW_MESSAGES'] != 'true'
+        logger.info "\n\n#{'*' * 80}\n\nPrefer it was someone else's job to deal with this error? Check out https://pactflow.io/oss for a hardened, fully supported SaaS version of the Pact Broker with an improved UI  + more.\n\n#{'*' * 80}\n"
+      end
     end
   end
 

data/lib/pact_broker/matrix/deployment_status_summary.rb

@@ -31,7 +31,7 @@ module PactBroker
       end
 
       def reasons
-        error_messages.any? ? error_messages : success_messages
+        error_messages.any? ? error_messages + warning_messages : success_messages + warning_messages
       end
 
       private
@@ -51,6 +51,10 @@ module PactBroker
         end
       end
 
+      def warning_messages
+        warnings_for_missing_interactions
+      end
+
       def specified_selectors_that_do_not_exist
         resolved_selectors.select(&:specified_version_that_does_not_exist?)
       end
@@ -182,6 +186,24 @@ module PactBroker
           [dummy_consumer_selector, dummy_provider_selector]
         end.flatten
       end
+
+      # experimental
+      def warnings_for_missing_interactions
+        rows.select(&:success).collect do | row |
+          begin
+            if row.verification.interactions_missing_test_results.any? && !row.verification.all_interactions_missing_test_results?
+              InteractionsMissingVerifications.new(selector_for(row.consumer_name), selector_for(row.provider_name), row.verification.interactions_missing_test_results)
+            end
+          rescue StandardError => e
+            log_error(e, "Error determining if there were missing interaction verifications")
+            nil
+          end
+        end.compact.tap { |it| report_missing_interaction_verifications(it) if it.any? }
+      end
+
+      def report_missing_interaction_verifications(messages)
+        logger.warn("Interactions missing verifications", messages)
+      end
     end
   end
 end

data/lib/pact_broker/matrix/reason.rb

@@ -73,5 +73,14 @@ module PactBroker
     # provider verifications.
     class NoDependenciesMissing < Reason
     end
+
+    class InteractionsMissingVerifications < ErrorReasonWithTwoSelectors
+      attr_reader :interactions
+
+      def initialize(consumer_selector, provider_selector, interactions)
+        super(consumer_selector, provider_selector)
+        @interactions = interactions
+      end
+    end
   end
 end

data/lib/pact_broker/pacts/content.rb

@@ -31,14 +31,25 @@ module PactBroker
         Content.from_hash(SortContent.call(pact_hash))
       end
 
+      def interactions_missing_test_results
+        interactions.reject do | interaction |
+          interaction['tests']&.any?
+        end
+      end
+
       def with_test_results(test_results)
+        tests = test_results && test_results['tests']
+        if tests.nil? || !tests.is_a?(Array) || tests.empty?
+          tests = []
+        end
+
         new_pact_hash = pact_hash.dup
         if interactions && interactions.is_a?(Array)
-          new_pact_hash['interactions'] = merge_verification_results(interactions, test_results)
+          new_pact_hash['interactions'] = merge_verification_results(interactions, tests)
         end
 
         if messages && messages.is_a?(Array)
-          new_pact_hash['messages'] = merge_verification_results(messages, test_results)
+          new_pact_hash['messages'] = merge_verification_results(messages, tests)
         end
         Content.from_hash(new_pact_hash)
       end
@@ -107,6 +118,19 @@ module PactBroker
           end
         end
       end
+
+      def merge_verification_results(interactions, tests)
+        interactions.collect(&:dup).collect do | interaction |
+          interaction['tests'] = tests.select do | test |
+            test_is_for_interaction(interaction, test)
+          end
+          interaction
+        end
+      end
+
+      def test_is_for_interaction(interaction, test)
+        test.is_a?(Hash) && interaction.is_a?(Hash) && test['interactionDescription'] == interaction['description'] && test['interactionProviderState'] == interaction['providerState']
+      end
     end
   end
 end

data/lib/pact_broker/pacts/repository.rb

@@ -107,8 +107,8 @@ module PactBroker
       end
 
       def delete_all_pact_publications_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))
         query = PactPublication.where(consumer: consumer, provider: provider)
         query = query.tag(options[:tag]) if options[:tag]
 

data/lib/pact_broker/tasks/migration_task.rb

@@ -16,8 +16,10 @@ module PactBroker
     class MigrationTask < ::Rake::TaskLib
 
       attr_accessor :database_connection
+      attr_accessor :options
 
       def initialize &block
+        @options = {}
         rake_task &block
       end
 
@@ -27,12 +29,29 @@ module PactBroker
             desc "Run sequel migrations for pact broker database"
             task :migrate, [:target] do | t, args |
               require 'pact_broker/db/migrate'
+              require 'pact_broker/db/version'
+
               instance_eval(&block)
-              options = {}
+
               if args[:target]
                 options[:target] = args[:target].to_i
               end
+
+              if (logger = database_connection.loggers.first)
+                current_version = PactBroker::DB::Version.call(database_connection)
+                if options[:target]
+                  logger.info "Migrating from schema version #{current_version} to #{options[:target]}"
+                else
+                  logger.info "Migrating from schema version #{current_version} to latest"
+                end
+              end
+
               PactBroker::DB::Migrate.call(database_connection, options)
+
+              if logger
+                current_version = PactBroker::DB::Version.call(database_connection)
+                logger.info "Current schema version is now #{current_version}"
+              end
             end
           end
         end

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

@@ -12,7 +12,7 @@ module PactBroker
         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
+          PactBroker.configuration.base_url || ''
         end
       end
     end

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

@@ -7,7 +7,7 @@
           %a{href: "#{base_url}?tags=true"}
             Show latest tags
         - else
-          %a{href: "#{base_url}"}
+          %a{href: "#{base_url}/"}
             Hide latest tags
 
         %a{href: "#{base_url}/hal-browser/browser.html"}

data/lib/pact_broker/verifications/repository.rb

@@ -136,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.55.0'
+  VERSION = '2.56.0'
 end

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/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/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

data/spec/integration/ui/matrix_spec.rb

@@ -31,7 +31,7 @@ describe "UI matrix" 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"
+      expect(subject.body).to include "/matrix/provider/Bar/latest/ptag/consumer/Foo/latest/ctag/badge.svg"
     end
   end
 end

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

@@ -10,7 +10,7 @@ module PactBroker
 
         describe "the number of Reason classes" do
           it "is 9 - add another spec here if a new Reason is added" do
-            expect(REASON_CLASSES.size).to eq 9
+            expect(REASON_CLASSES.size).to eq 10
           end
         end
 
@@ -52,6 +52,23 @@ module PactBroker
 
             its(:to_s) { is_expected.to eq "All required verification results are published and successful" }
           end
+
+          context "when the reason is PactBroker::Matrix::InteractionsMissingVerifications" do
+            let(:reason) { PactBroker::Matrix::InteractionsMissingVerifications.new(consumer_selector, provider_selector, interactions) }
+            let(:interactions) do
+              [
+                {
+                  "description" => "desc1",
+                  "providerState" => "p2"
+                },{
+                  "description" => "desc1",
+                  "providerStates" => [ { "name" => "desc3"}, { "name" => "desc4"} ]
+                }
+              ]
+            end
+
+            its(:to_s) { is_expected.to eq "WARNING: Although the verification was reported as successful, the results for version 2 of Foo and version 6 of Bar may be missing tests for the following interactions: desc1 given p2; desc1 given desc3, desc4" }
+          end
         end
       end
     end

data/spec/lib/pact_broker/doc/controllers/app_spec.rb

@@ -26,6 +26,22 @@ module PactBroker
               subject
               expect(last_response.body).to include "<html>"
             end
+
+            context "with the base_url not set" do
+              it "returns relative links" do
+                expect(subject.body).to include "href='/css"
+              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/css"
+              end
+            end
           end
 
           context "when the resource does not exist" do

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

@@ -248,6 +248,12 @@ module PactBroker
             Service.delete("Foo", "Foo")
           end
         end
+
+        context "when the pacticipants are not found for some bizarre reason (I can't see how this can happen, but it has)" do
+          it "raises an error" do
+            expect { Service.delete("Foo", "Bar") }.to raise_error(PactBroker::Error, /found/)
+          end
+        end
       end
 
       describe "delete_all" do

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

@@ -29,7 +29,8 @@ module PactBroker
             provider_name: bar.name,
             provider_id: bar.id,
             success: row_1_success,
-            pacticipant_names: [foo.name, bar.name]
+            pacticipant_names: [foo.name, bar.name],
+            verification: verification_1
           )
         end
 
@@ -46,7 +47,8 @@ module PactBroker
             provider_name: baz.name,
             provider_id: baz.id,
             success: true,
-            pacticipant_names: [foo.name, baz.name]
+            pacticipant_names: [foo.name, baz.name],
+            verification: verification_2
           )
         end
 
@@ -65,6 +67,8 @@ module PactBroker
         let(:foo_version) { double('foo version', number: "ddec8101dabf4edf9125a69f9a161f0f294af43c", id: 10)}
         let(:bar_version) { double('bar version', number: "14131c5da3abf323ccf410b1b619edac76231243", id: 11)}
         let(:baz_version) { double('baz version', number: "4ee06460f10e8207ad904fa9fa6c4842e462ab59", id: 12)}
+        let(:verification_1) { double('verification 1', interactions_missing_test_results: []) }
+        let(:verification_2) { double('verification 2', interactions_missing_test_results: []) }
 
         let(:resolved_selectors) do
           [

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

@@ -416,6 +416,49 @@ module PactBroker
             expect(subject.deployment_status_summary).to be_deployable
           end
         end
+
+        describe "when verification results are published missing tests for some interactions" do
+          let(:pact_content) do
+            {
+              "interactions" => [
+                {
+                  "description" => "desc1"
+                },{
+                  "description" => "desc2"
+                }
+              ]
+            }
+          end
+
+          let(:verification_tests) do
+            [
+              {
+                "interactionDescription" => "desc1"
+              }
+            ]
+          end
+
+          before do
+            td.create_consumer("Foo")
+              .create_provider("Bar")
+              .create_consumer_version
+              .create_pact(json_content: pact_content.to_json)
+              .create_verification(provider_version: "1", test_results: { tests: verification_tests })
+          end
+
+          let(:selectors) do
+            [
+              UnresolvedSelector.new(pacticipant_name: "Foo", latest: true),
+              UnresolvedSelector.new(pacticipant_name: "Bar", latest: true)
+            ]
+          end
+
+          let(:options) { { latestby: "cvpv"} }
+
+          it "should include a warning" do
+            expect(subject.deployment_status_summary.reasons.last).to be_a(PactBroker::Matrix::InteractionsMissingVerifications)
+          end
+        end
       end
     end
   end

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

@@ -227,6 +227,131 @@ module PactBroker
           its(:pact_specification_version) { is_expected.to eq nil }
         end
       end
+
+      describe "with_test_results" do
+        let(:test_results) do
+          {
+            "tests" => [
+              {
+                "interactionProviderState" => "ps1",
+                "interactionDescription" => "desc1"
+              },{
+                "interactionProviderState" => "ps1",
+                "interactionDescription" => "desc1"
+              }
+            ]
+          }
+        end
+
+        let(:pact_content) do
+          {
+            "interactions" => [
+              {
+               "providerState" => "ps1",
+               "description" => "desc1",
+              },
+              {
+               "providerState" => "ps2",
+               "description" => "desc2",
+              }
+            ]
+          }
+        end
+
+        subject { Content.from_hash(pact_content).with_test_results(test_results) }
+
+        let(:merged) do
+          {
+            "interactions" => [
+              {
+               "providerState" => "ps1",
+               "description" => "desc1",
+               "tests" => [
+                {
+                  "interactionProviderState" => "ps1",
+                  "interactionDescription" => "desc1",
+                },{
+                  "interactionProviderState" => "ps1",
+                  "interactionDescription" => "desc1",
+                }
+               ]
+              },{
+               "providerState" => "ps2",
+               "description" => "desc2",
+               "tests" => []
+              }
+            ]
+          }
+        end
+
+        let(:merged_with_empty_tests) do
+          {
+            "interactions" => [
+              {
+               "providerState" => "ps1",
+               "description" => "desc1",
+               "tests" => []
+              },{
+               "providerState" => "ps2",
+               "description" => "desc2",
+               "tests" => []
+              }
+            ]
+          }
+        end
+
+        it "merges the contents with the results" do
+          expect(subject.to_hash).to eq merged
+        end
+
+        it "returns interactions without test results" do
+          expect(subject.interactions_missing_test_results.count).to eq 1
+        end
+
+        context "with nil test results" do
+          let(:test_results) { nil }
+
+          it "does not blow up" do
+            expect(subject.to_hash).to eq merged_with_empty_tests
+          end
+
+          it "returns interactions without test results" do
+            expect(subject.interactions_missing_test_results.count).to eq 2
+          end
+        end
+
+        context "with nil tests" do
+          let(:test_results) { {} }
+
+          it "does not blow up" do
+            expect(subject.to_hash).to eq merged_with_empty_tests
+          end
+        end
+
+        context "with empty tests" do
+          let(:test_results) { { "tests" => [] } }
+
+          it "does not blow up" do
+            expect(subject.to_hash).to eq merged_with_empty_tests
+          end
+        end
+
+        context "with tests not an array" do
+          let(:test_results) { { "tests" => {} } }
+
+          it "does not blow up" do
+            expect(subject.to_hash).to eq merged_with_empty_tests
+          end
+        end
+
+        context "with tests an array of not hashes" do
+          let(:test_results) { { "tests" => [1] } }
+
+          it "does not blow up" do
+            expect(subject.to_hash).to eq merged_with_empty_tests
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.55.0
+  version: 2.56.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty