pact_broker 2.58.2 → 2.60.0

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

@@ -53,7 +53,25 @@ module PactBroker
 
       context "when an error occurs for the first time" do
         before do
-          allow(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now).and_raise("an error")
+          allow(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now).and_raise(error)
+        end
+
+        let(:error) { "an error" }
+
+        context "when the error is HTTP related (most likely caused by a problem with the webhook or request itself)" do
+          let(:error) { Errno::ECONNREFUSED.new }
+
+          it "logs a message at info" do
+            expect(logger).to receive(:info).with(/Error executing/, error)
+            subject
+          end
+        end
+
+        context "when the error is not HTTP related (most likely caused by a code, platform or environment issue)" do
+          it "logs a message at warn" do
+            expect(logger).to receive(:warn).with(/Error executing/, instance_of(RuntimeError))
+            subject
+          end
         end
 
         it "reschedules the job in 10 seconds" do

data/spec/support/database_cleaner.rb

@@ -8,11 +8,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     if defined?(::DB)
       DatabaseCleaner.strategy = :transaction
-      if DB.mysql?
-        DatabaseCleaner.clean_with :deletion
-      else
-        DatabaseCleaner.clean_with :truncation
-      end
+      PactBroker::Database.truncate
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.58.2
+  version: 2.60.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -581,7 +581,6 @@ files:
 - lib/pact_broker/api/contracts/put_pact_params_contract.rb
 - lib/pact_broker/api/contracts/request_validations.rb
 - lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema.rb
-- lib/pact_broker/api/contracts/verifiable_pacts_query_schema.rb
 - lib/pact_broker/api/contracts/verification_contract.rb
 - lib/pact_broker/api/contracts/webhook_contract.rb
 - lib/pact_broker/api/decorators.rb
@@ -760,6 +759,7 @@ files:
 - lib/pact_broker/doc/views/pact/tag-prod-version.markdown
 - lib/pact_broker/doc/views/pact/tag-version.markdown
 - lib/pact_broker/doc/views/pending-provider-pacts.markdown
+- lib/pact_broker/doc/views/provider-pacts-for-verification.markdown
 - lib/pact_broker/doc/views/provider.markdown
 - lib/pact_broker/doc/views/version/latest-verification-results-where-pacticipant-is-consumer.markdown
 - lib/pact_broker/doc/views/webhooks.markdown
@@ -1120,7 +1120,6 @@ files:
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb
@@ -1506,7 +1505,6 @@ test_files:
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb
-- spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
 - spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb

data/lib/pact_broker/api/contracts/verifiable_pacts_query_schema.rb

@@ -1,36 +0,0 @@
-require 'dry-validation'
-require 'pact_broker/api/contracts/dry_validation_workarounds'
-require 'pact_broker/api/contracts/dry_validation_predicates'
-
-module PactBroker
-  module Api
-    module Contracts
-      class VerifiablePactsQuerySchema
-        extend DryValidationWorkarounds
-        using PactBroker::HashRefinements
-
-        SCHEMA = Dry::Validation.Schema do
-          configure do
-            predicates(DryValidationPredicates)
-            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
-          end
-          optional(:provider_version_tags).maybe(:array?)
-          optional(:consumer_version_selectors).each do
-            schema do
-              required(:tag).filled(:str?)
-              optional(:latest).filled(included_in?: ["true", "false"])
-              optional(:fallback_tag).filled(:str?)
-              optional(:consumer).filled(:str?, :not_blank?)
-            end
-          end
-          optional(:include_pending_status).filled(included_in?: ["true", "false"])
-          optional(:include_wip_pacts_since).filled(:date?)
-        end
-
-        def self.call(params)
-          select_first_message(flatten_indexed_messages(SCHEMA.call(params&.symbolize_keys).messages(full: true)))
-        end
-      end
-    end
-  end
-end

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

@@ -1,97 +0,0 @@
-require 'pact_broker/api/contracts/verifiable_pacts_query_schema'
-
-module PactBroker
-  module Api
-    module Contracts
-      describe VerifiablePactsQuerySchema do
-        let(:params) do
-          {
-            provider_version_tags: provider_version_tags,
-            consumer_version_selectors: consumer_version_selectors
-          }
-        end
-
-        let(:provider_version_tags) { %w[master] }
-
-        let(:consumer_version_selectors) do
-          [{
-            tag: "master",
-            latest: "true"
-          }]
-        end
-
-        subject { VerifiablePactsQuerySchema.(params) }
-
-        context "when the params are valid" do
-          it "has no errors" do
-            expect(subject).to eq({})
-          end
-        end
-
-        context "when provider_version_tags is not an array" do
-          let(:provider_version_tags) { "foo" }
-
-          it { is_expected.to have_key(:provider_version_tags) }
-        end
-
-        context "when the consumer_version_selector is missing a tag" do
-          let(:consumer_version_selectors) do
-            [{}]
-          end
-
-          it "flattens the messages" do
-            expect(subject[:consumer_version_selectors].first).to eq "tag is missing at index 0"
-          end
-        end
-
-        context "when the consumer_version_selectors is missing the latest" do
-          let(:consumer_version_selectors) do
-            [{
-              tag: "master"
-            }]
-          end
-
-          it { is_expected.to be_empty }
-        end
-
-        context "when include_wip_pacts_since key exists" do
-          let(:include_wip_pacts_since) { nil }
-          let(:params) do
-            {
-              include_wip_pacts_since: include_wip_pacts_since
-            }
-          end
-
-          context "when it is nil" do
-            it { is_expected.to have_key(:include_wip_pacts_since) }
-          end
-
-          context "when it is not a date" do
-            let(:include_wip_pacts_since) { "foo" }
-
-            it { is_expected.to have_key(:include_wip_pacts_since) }
-          end
-
-          context "when it is a valid date" do
-            let(:include_wip_pacts_since) { "2013-02-13T20:04:45.000+11:00" }
-
-            it { is_expected.to_not have_key(:include_wip_pacts_since) }
-          end
-        end
-
-        context "when a blank consumer name is specified" do
-          let(:consumer_version_selectors) do
-            [{
-              tag: "feat-x",
-              consumer: ""
-            }]
-          end
-
-          it "has an error" do
-            expect(subject[:consumer_version_selectors].first).to include "blank"
-          end
-        end
-      end
-    end
-  end
-end