pact_broker 2.58.2 → 2.60.0

data/spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb

@@ -71,6 +71,27 @@ module PactBroker
           end
         end
 
+        context "when the latest version for a particular consumer is requested" do
+          let(:consumer_version_selectors) do
+            [{
+              consumer: "Foo",
+              latest: true
+            }]
+          end
+
+          it { is_expected.to be_empty }
+        end
+
+        context "when the latest version for all is requested" do
+          let(:consumer_version_selectors) do
+            [{
+              latest: true
+            }]
+          end
+
+          it { is_expected.to be_empty }
+        end
+
         context "when providerVersionTags is not an array" do
           let(:provider_version_tags) { true }
 
@@ -89,7 +110,7 @@ module PactBroker
           end
 
           it "flattens the messages" do
-            expect(subject[:consumerVersionSelectors].first).to eq "tag is missing at index 0"
+            expect(subject[:consumerVersionSelectors].first).to eq "latest must be true, or a tag must be provided (at index 0)"
           end
         end
 
@@ -150,9 +171,7 @@ module PactBroker
             }]
           end
 
-          it "has an error" do
-            expect(subject[:consumerVersionSelectors].first).to include "not yet supported"
-          end
+          it { is_expected.to be_empty }
         end
       end
     end

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

@@ -51,6 +51,10 @@ module PactBroker
           expect(subject[:_embedded][:tags].first[:name]).to eq "prod"
         end
 
+        it "includes the timestamps" do
+          expect(subject[:createdAt]).to_not be nil
+        end
+
         it "includes a list of sorted pacts" do
           expect(subject[:_links][:'pb:pact-versions']).to be_instance_of(Array)
           expect(subject[:_links][:'pb:pact-versions'].first[:href]).to include ("1.2.3")

data/spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb

@@ -23,22 +23,26 @@ module PactBroker
           Timecop.return
         end
 
-        let(:consumer) { double('consumer', name: 'Consumer')}
-        let(:provider) { double('provider', name: 'Provider')}
+        let(:consumer_name) { 'Consumer' }
+        let(:provider_name) { 'Provider' }
+        let(:consumer_version_number) { '1.2.3' }
+        let(:consumer) { double('consumer', name: consumer_name) }
+        let(:provider) { double('provider', name: provider_name) }
         let(:consumer_version) { double('consumer version') }
         let(:created_at) { DateTime.new(2014, 02, 27) }
         let(:json_content) { load_fixture('renderer_pact.json') }
         let(:pact) do
           double('pact',
             json_content: json_content,
-            consumer_version_number: '1.2.3',
+            consumer_version_number: consumer_version_number,
             consumer: consumer,
             provider: provider,
-            consumer_version_tag_names: ['prod', 'master'],
+            consumer_version_tag_names: consumer_version_tag_names,
             created_at: created_at,
             consumer_version: consumer_version
             )
         end
+        let(:consumer_version_tag_names) { ['prod', 'master'] }
         let(:pact_url) { '/pact/url' }
         let(:matrix_url) { '/matrix/url' }
         let(:options) do
@@ -49,7 +53,7 @@ module PactBroker
         end
         let(:logger) { double('logger').as_null_object }
 
-        subject { HtmlPactRenderer.call pact, options }
+        subject { HtmlPactRenderer.call(pact, options) }
 
         describe ".call" do
           it "renders the pact as HTML" do
@@ -69,7 +73,7 @@ module PactBroker
           end
 
           it "renders the badge image" do
-            expect(subject).to include "<img src='http://badge'/>"
+            expect(subject).to include "<img src=\"http://badge\"/>"
           end
 
           it "renders a text area with the badge markdown" do
@@ -81,6 +85,20 @@ module PactBroker
             expect(subject).to include matrix_url
           end
 
+          context "with dodgey data" do
+            let(:consumer_name) { '<script>alert("consumer");</script>' }
+            let(:provider_name) { '<script>alert("provider");</script>' }
+            let(:consumer_version_number) { '<script>alert("version");</script>' }
+            let(:consumer_version_tag_names) { ['<script>alert("tag");</script>'] }
+
+            it "does not contain the literal <script> anywhere except the badge markdown" do
+              expect(subject).to_not include consumer_version_number
+              expect(subject.scan(consumer_name).count).to eq 1
+              expect(subject.scan(provider_name).count).to eq 1
+              expect(subject).to include '[![<script>alert("consumer");</script>/<script>alert("provider");</script> Pact Status](http://badge)]'
+            end
+          end
+
           context "when enable_public_badge_access is false" do
             before do
               PactBroker.configuration.enable_public_badge_access = false

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

@@ -5,7 +5,6 @@ module PactBroker
     module Resources
       describe ErrorHandler do
         describe "call" do
-
           before do
             allow(ErrorHandler).to receive(:logger).and_return(logger)
             allow(SecureRandom).to receive(:urlsafe_base64).and_return("bYWfn-+yWPlf")
@@ -45,6 +44,24 @@ module PactBroker
             subject
           end
 
+          context "when the error class is in the warning_error_classes list" do
+            let(:error) { Sequel::ForeignKeyConstraintViolation.new }
+
+            it "logs at warn so as not to wake everyone up in the middle of the night" do
+              expect(logger).to receive(:warn).with(/bYWfnyWPlf/, error)
+              subject
+            end
+          end
+
+          context "when the error is not reportable and not a warning level" do
+            let(:error) { PactBroker::Error.new('foo') }
+
+            it "logs at info" do
+              expect(logger).to receive(:info).with(/bYWfnyWPlf/, error)
+              subject
+            end
+          end
+
           context "when show_backtrace_in_error_response? is true" do
             before do
               allow(PactBroker.configuration).to receive(:show_backtrace_in_error_response?).and_return(true)

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         let(:provider) { double('provider') }
-        let(:pacts) { double('pacts') }
+        let(:pacts) { [] }
         let(:path) { '/pacts/provider/Bar/for-verification' }
         let(:decorator) { instance_double('PactBroker::Api::Decorators::VerifiablePactsDecorator') }
         let(:query) do
@@ -23,35 +23,7 @@ module PactBroker
           }
         end
 
-        subject { get(path, query) }
-
-        describe "GET" do
-          it "finds the pacts for verification by the provider" do
-            # Naughty not mocking out the query parsing...
-            expect(PactBroker::Pacts::Service).to receive(:find_for_verification).with(
-              "Bar",
-              ["master"],
-              PactBroker::Pacts::Selectors.new([PactBroker::Pacts::Selector.latest_for_tag("dev")]),
-              {
-                include_wip_pacts_since: DateTime.parse('2018-01-01'),
-                include_pending_status: true
-              }
-            )
-            subject
-          end
-
-          context "when there are validation errors" do
-            let(:query) do
-              {
-                provider_version_tags: true,
-              }
-            end
-
-            it "returns the keys with the right case" do
-              expect(JSON.parse(subject.body)['errors']).to have_key('provider_version_tags')
-            end
-          end
-        end
+        subject { post(path, request_body.to_json, request_headers) }
 
         describe "POST" do
           let(:request_body) do
@@ -70,8 +42,6 @@ module PactBroker
             }
           end
 
-          subject { post(path, request_body.to_json, request_headers) }
-
           it "finds the pacts for verification by the provider" do
             # Naughty not mocking out the query parsing...
             expect(PactBroker::Pacts::Service).to receive(:find_for_verification).with(
@@ -97,14 +67,14 @@ module PactBroker
               expect(JSON.parse(subject.body)['errors']).to have_key('providerVersionTags')
             end
           end
-        end
 
-        it "uses the correct options for the decorator" do
-          expect(decorator).to receive(:to_json) do | options |
-            expect(options[:user_options][:title]).to eq "Pacts to be verified by provider Bar"
-            expect(options[:user_options][:include_pending_status]).to eq true
+          it "uses the correct options for the decorator" do
+            expect(decorator).to receive(:to_json) do | options |
+              expect(options[:user_options][:title]).to eq "Pacts to be verified by provider Bar"
+              expect(options[:user_options][:include_pending_status]).to eq true
+            end
+            subject
           end
-          subject
         end
       end
     end

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

@@ -13,7 +13,7 @@ module PactBroker
       let(:expected_url) { "https://img.shields.io/badge/#{expected_left_text}-#{expected_right_text}-#{expected_color}.svg" }
       let(:expected_color) { "brightgreen" }
       let(:expected_right_text) { "verified" }
-      let(:expected_left_text) { "foo--bar%2fthing__blah%20pact" }
+      let(:expected_left_text) { "foo--bar%2Fthing__blah%20pact" }
       let(:response_status) { 200 }
       let!(:http_request) do
         stub_request(:get, expected_url).to_return(:status => response_status, :body => "svg")
@@ -62,7 +62,7 @@ module PactBroker
           end
 
           context "when initials is true" do
-            let(:expected_left_text) { "fb%2ftb%20pact" }
+            let(:expected_left_text) { "fb%2Ftb%20pact" }
             let(:initials) { true }
 
             it "creates a badge with the consumer and provider initials" do
@@ -73,7 +73,7 @@ module PactBroker
           end
 
           context "when initials is true but the consumer and provider names only contain one word" do
-            let(:expected_left_text) { "foo%2fbar%20pact" }
+            let(:expected_left_text) { "foo%2Fbar%20pact" }
             let(:initials) { true }
             let(:pact) { double("pact", consumer_name: "Foo", provider_name: "Bar") }
 
@@ -85,7 +85,7 @@ module PactBroker
           end
 
           context "when initials is true but the consumer and provider names are one camel cased word" do
-            let(:expected_left_text) { "fa%2fbp%20pact" }
+            let(:expected_left_text) { "fa%2Fbp%20pact" }
             let(:initials) { true }
             let(:pact) { double("pact", consumer_name: "FooApp", provider_name: "barProvider") }
 
@@ -97,7 +97,7 @@ module PactBroker
           end
 
           context "when initials is true but the consumer and provider names are one camel cased word" do
-            let(:expected_left_text) { "fa%2fdat%20pact" }
+            let(:expected_left_text) { "fa%2Fdat%20pact" }
             let(:initials) { true }
             let(:pact) { double("pact", consumer_name: "FooApp", provider_name: "doAThing") }
 
@@ -111,7 +111,7 @@ module PactBroker
           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" }
+            let(:expected_left_text) { "foo--bar%20%28prod%29%2Fthing__blah%20%28master%29%20pact" }
 
             it "creates a badge with the consumer and provider names, not initials" do
               subject

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

@@ -308,6 +308,14 @@ module PactBroker
           expect(subject.interactions_missing_test_results.count).to eq 1
         end
 
+        context "with no interactions" do
+          let(:pact_content) { {} }
+
+          it "does not blow up" do
+            expect(subject.interactions_missing_test_results.count).to eq 0
+          end
+        end
+
         context "with nil test results" do
           let(:test_results) { nil }
 
@@ -351,6 +359,88 @@ module PactBroker
             expect(subject.to_hash).to eq merged_with_empty_tests
           end
         end
+
+        context "with the new format" do
+          let(:test_results) do
+            [
+              {
+                "interactionId" => "1",
+                "success "=> false
+              },{
+                "foo" => "bar"
+              }
+            ]
+          end
+
+          let(:pact_content) do
+            {
+              "interactions" => [
+                {
+                 "_id" => "1"
+                },
+                {
+                 "_id" => "2"
+                }
+              ]
+            }
+          end
+
+          let(:merged) do
+            {
+              "interactions" => [
+                {
+                 "_id" => "1",
+                 "tests" => [{
+                    "interactionId" => "1",
+                    "success "=> false
+                  }]
+                },{
+                 "_id" => "2",
+                 "tests" => []
+                }
+              ]
+            }
+          end
+
+          it "merges the tests into the pact content" do
+            expect(subject.to_hash).to eq merged
+          end
+        end
+      end
+
+      describe "interaction_ids" do
+        let(:interaction_1) do
+          {
+            _id: '1'
+          }
+        end
+
+        let(:interaction_2) do
+          {
+            _id: '2'
+          }
+        end
+
+        let(:interaction_3) do
+          {
+          }
+        end
+
+        let(:content_hash) do
+          {
+            interactions: [interaction_1, interaction_2, interaction_3]
+          }
+        end
+
+        subject { Content.from_json(content_hash.to_json) }
+
+        its(:interaction_ids) { is_expected.to eq ['1', '2'] }
+
+        context "when there are no interactions" do
+          let(:content_hash) { {} }
+
+          its(:interaction_ids) { is_expected.to eq [] }
+        end
       end
     end
   end

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

@@ -56,6 +56,20 @@ module PactBroker
             it "sets the latest flag on the selector" do
               expect(find_by_consumer_version_number("1").selectors.first.latest).to be true
             end
+
+            context "when a consumer is specified" do
+              before do
+                td.create_pact_with_consumer_version_tag("Foo2", "3", "master", "Bar")
+              end
+
+              let(:selector) { Selector.new(tag: tag, fallback_tag: fallback_tag, latest: true, consumer: "Foo") }
+
+              it "only returns the pacts for the consumer" do
+                expect(subject.size).to eq 1
+                expect(subject.first.consumer.name).to eq "Foo"
+                expect(subject.first.selectors.first).to eq selector
+              end
+            end
           end
 
           context "when a pact does not exist for either tag or fallback_tag" do

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

@@ -40,6 +40,68 @@ module PactBroker
           end
         end
 
+        context "when the selector is latest: true" do
+          let(:pact_selector_1) { Selector.overall_latest }
+          let(:consumer_version_selectors) do
+            Selectors.new(pact_selector_1)
+          end
+
+          before do
+            td.create_pact_with_hierarchy("Foo1", "1", "Bar")
+              .create_pact_with_hierarchy("Foo1", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "3", "Bar")
+              .create_pact_with_hierarchy("Foo2", "4", "Bar2")
+          end
+
+          it "returns the latest pact for each consumer" do
+            expect(subject.size).to eq 2
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [Selector.overall_latest]
+            expect(find_by_consumer_name_and_consumer_version_number("Foo2", "3").selectors).to eq [Selector.overall_latest]
+          end
+        end
+
+        context "when the selector is latest: true for a particular consumer" do
+          let(:pact_selector_1) { Selector.latest_for_consumer("Foo1") }
+
+          let(:consumer_version_selectors) do
+            Selectors.new(pact_selector_1)
+          end
+
+          before do
+            td.create_pact_with_hierarchy("Foo1", "1", "Bar")
+              .create_pact_with_hierarchy("Foo1", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar2")
+          end
+
+          it "returns the latest pact for each consumer" do
+            expect(subject.size).to eq 1
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [pact_selector_1]
+          end
+        end
+
+        context "when the selector is latest: true, with a tag, for a particular consumer" do
+          let(:pact_selector_1) { Selector.latest_for_tag_and_consumer("prod", "Foo1") }
+
+          let(:consumer_version_selectors) do
+            Selectors.new(pact_selector_1)
+          end
+
+          before do
+            td.create_pact_with_hierarchy("Foo1", "1", "Bar")
+              .create_consumer_version_tag("prod")
+              .create_pact_with_hierarchy("Foo1", "2", "Bar")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar")
+              .create_consumer_version_tag("prod")
+              .create_pact_with_hierarchy("Foo2", "2", "Bar2")
+          end
+
+          it "returns the latest pact for each consumer" do
+            expect(subject.size).to eq 1
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "1").selectors).to eq [pact_selector_1]
+          end
+        end
+
         context "when the latest consumer tag names are specified" do
           before do
             td.create_pact_with_hierarchy("Foo", "foo-latest-prod-version", "Bar")