pact_broker 2.59.1 → 2.62.0

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")

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/lib/pact_broker/webhooks/repository_spec.rb

@@ -386,7 +386,7 @@ module PactBroker
             .create_verification
         end
 
-        subject { Repository.new.create_triggered_webhook '1234', td.webhook, td.pact, td.verification, 'publication' }
+        subject { Repository.new.create_triggered_webhook '1234', td.webhook, td.pact, td.verification, 'publication', 'some_event' }
 
         it "creates a TriggeredWebhook" do
           expect(subject.webhook_uuid ).to eq td.webhook.uuid
@@ -395,6 +395,7 @@ module PactBroker
           expect(subject.verification).to eq td.verification
           expect(subject.trigger_uuid).to eq '1234'
           expect(subject.trigger_type).to eq 'publication'
+          expect(subject.event_name).to eq 'some_event'
         end
 
         it "sets the webhook" do
@@ -418,7 +419,7 @@ module PactBroker
         end
 
         context "without a verification" do
-          subject { Repository.new.create_triggered_webhook '1234', td.webhook, td.pact, nil, 'publication' }
+          subject { Repository.new.create_triggered_webhook '1234', td.webhook, td.pact, nil, 'publication', 'some_event' }
 
           it "does not set the verification" do
             expect(subject.verification).to be nil

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

@@ -233,8 +233,8 @@ module PactBroker
           end
 
           it "logs the error" do
-            allow(Service.logger).to receive(:error)
-            expect(Service.logger).to receive(:error).with(/an error/)
+            allow(Service.logger).to receive(:warn)
+            expect(Service.logger).to receive(:warn).with(/Error scheduling/, StandardError)
             subject
           end
         end

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
 

data/tasks/database.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/project_root'
 require 'pact_broker/db/migrate'
 require 'pact_broker/db/version'
+require 'pact_broker/db'
 require 'sequel'
 require 'yaml'
 require_relative 'database/table_dependency_calculator'

data/tasks/database/table_dependency_calculator.rb

@@ -1,45 +1,8 @@
+require 'pact_broker/db/table_dependency_calculator'
+
 module PactBroker
   module Database
-
-    # Returns a list of the tables in the database in the order in which
-    # they can be truncated or dropped
-    class TableDependencyCalculator
-
-      def self.call connection
-        new(connection).call
-      end
-
-      def initialize connection
-        @connection = connection
-      end
-
-      def call
-        ordered_table_names = []
-        dependencies = @connection
-          .tables
-          .collect{|it| @connection.foreign_key_list(it)
-          .collect{|fk| {from: it, to: fk[:table]} } }
-          .flatten
-          .uniq
-        table_names = @connection.tables - [:schema_migrations, :schema_info]
-        check(table_names, dependencies, ordered_table_names)
-        ordered_table_names
-      end
-
-      def deps_on table_name, deps
-        deps.select{ | d| d[:to] == table_name }.collect{ |d| d[:from] }
-      end
-
-      def check table_names, deps, ordered_table_names
-        return if table_names.size == 0
-        remaining_dependencies = deps_on(table_names.first, deps) - ordered_table_names
-        if remaining_dependencies.size == 0
-          ordered_table_names << table_names.first
-          check(table_names[1..-1], deps, ordered_table_names)
-        else
-          check((remaining_dependencies + table_names).uniq, deps, ordered_table_names)
-        end
-      end
-    end
+    # For backwards compatibility
+    TableDependencyCalculator = PactBroker::DB::TableDependencyCalculator
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.59.1
+  version: 2.62.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -517,6 +517,7 @@ files:
 - db/migrations/20191101_create_head_pact_tags.rb
 - db/migrations/20200318_add_created_at_to_latest_pact_publications.rb
 - db/migrations/20200319_add_created_at_to_latest_verifications.rb
+- db/migrations/20200922_add_event_to_triggered_webhook.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -722,6 +723,7 @@ files:
 - lib/pact_broker/db/seed/pact_2.json
 - lib/pact_broker/db/seed/pact_3.json
 - lib/pact_broker/db/seed_example_data.rb
+- lib/pact_broker/db/table_dependency_calculator.rb
 - lib/pact_broker/db/validate_encoding.rb
 - lib/pact_broker/db/version.rb
 - lib/pact_broker/diagnostic/app.rb
@@ -760,6 +762,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