pact_broker 2.27.6 → 2.29.0

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

@@ -139,6 +139,7 @@ module PactBroker
         let(:existing_pact) do
           TestDataBuilder.new.create_pact_with_hierarchy("A Consumer", "1.2.3", "A Provider", original_json_content).and_return(:pact)
         end
+        let(:repository) { Repository.new }
 
         before do
           ::DB::PACT_BROKER_DB[:pact_publications]
@@ -155,10 +156,8 @@ module PactBroker
         let(:original_json_content) { {some: 'json'}.to_json }
         let(:json_content) { {some_other: 'json'}.to_json }
 
-
         context "when the attributes have changed" do
-
-          subject { Repository.new.update existing_pact.id, json_content: json_content }
+          subject { repository.update existing_pact.id, json_content: json_content }
 
           it "creates a new PactVersion" do
             expect { subject }.to change{ PactBroker::Pacts::PactPublication.count }.by(1)
@@ -186,11 +185,27 @@ module PactBroker
           it "increments the revision_number by 1" do
             expect(subject.revision_number).to eq 2
           end
+
+          context "when there is a race condition" do
+            before do
+              allow(repository).to receive(:next_revision_number) { | existing_pact | existing_pact.revision_number }
+            end
+
+            it "updates the existing row - yes this is destructive, by MySQL not supporting inner queries stops us doing a SELECT revision_number + 1" do
+              # And if we're conflicting the time between the two publications is so small that nobody
+              # can have depended on the content of the first pact
+              expect { subject }.to_not change{ PactBroker::Pacts::PactPublication.count }
+            end
+
+            it "sets the content to the new content" do
+              expect(subject.json_content).to eq json_content
+            end
+          end
         end
 
         context "when the content has not changed" do
 
-          subject { Repository.new.update existing_pact.id, json_content: original_json_content }
+          subject { repository.update existing_pact.id, json_content: original_json_content }
 
           it "does not create a new PactVersion" do
             expect { subject }.to_not change{ PactBroker::Pacts::PactPublication.count }
@@ -217,6 +232,7 @@ module PactBroker
             .create_consumer_version("1.2.3")
             .create_provider(provider_name)
             .create_pact
+            .create_webhook
             .revise_pact
             .create_consumer_version("2.3.4")
             .create_pact

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

@@ -3,7 +3,6 @@ require 'pact_broker/webhooks/job'
 module PactBroker
   module Webhooks
     describe Job do
-
       before do
         PactBroker.configuration.webhook_retry_schedule = [10, 60, 120, 300, 600, 1200]
         allow(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now).and_return(result)
@@ -16,8 +15,9 @@ module PactBroker
       let(:result) { instance_double("PactBroker::Domain::WebhookExecutionResult", success?: success)}
       let(:success) { true }
       let(:logger) { double('logger').as_null_object }
+      let(:database_connector) { ->(&block) { block.call } }
 
-      subject { Job.new.perform(triggered_webhook: triggered_webhook) }
+      subject { Job.new.perform(triggered_webhook: triggered_webhook, database_connector: database_connector) }
 
       it "reloads the TriggeredWebhook object to make sure it has a fresh copy" do
         expect(PactBroker::Webhooks::TriggeredWebhook).to receive(:find).with(id: 1)
@@ -44,7 +44,7 @@ module PactBroker
         end
 
         it "reschedules the job in 10 seconds" do
-          expect(Job).to receive(:perform_in).with(10, {triggered_webhook: triggered_webhook, error_count: 1})
+          expect(Job).to receive(:perform_in).with(10, {triggered_webhook: triggered_webhook, error_count: 1, database_connector: database_connector})
           subject
         end
 
@@ -59,7 +59,7 @@ module PactBroker
         let(:success) { false }
 
         it "reschedules the job in 10 seconds" do
-          expect(Job).to receive(:perform_in).with(10, {triggered_webhook: triggered_webhook, error_count: 1})
+          expect(Job).to receive(:perform_in).with(10, {triggered_webhook: triggered_webhook, error_count: 1, database_connector: database_connector})
           subject
         end
 
@@ -84,10 +84,10 @@ module PactBroker
           allow(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now).and_raise("an error")
         end
 
-        subject { Job.new.perform(triggered_webhook: triggered_webhook, error_count: 1) }
+        subject { Job.new.perform(triggered_webhook: triggered_webhook, error_count: 1, database_connector: database_connector) }
 
         it "reschedules the job in 60 seconds" do
-          expect(Job).to receive(:perform_in).with(60, {triggered_webhook: triggered_webhook, error_count: 2})
+          expect(Job).to receive(:perform_in).with(60, {triggered_webhook: triggered_webhook, error_count: 2, database_connector: database_connector})
           subject
         end
 
@@ -101,7 +101,7 @@ module PactBroker
       context "when the job is not successful for the last time" do
         let(:success) { false }
 
-        subject { Job.new.perform(triggered_webhook: triggered_webhook, error_count: 6) }
+        subject { Job.new.perform(triggered_webhook: triggered_webhook, error_count: 6, database_connector: database_connector) }
 
         it "executes the job with an log message indicating that the webhook has failed" do
           expect(PactBroker::Webhooks::Service).to receive(:execute_triggered_webhook_now)
@@ -118,8 +118,8 @@ module PactBroker
         end
 
         it "logs that it has failed" do
-          allow(Job.logger).to receive(:error)
-          expect(Job.logger).to receive(:error).with(/Failed to execute/)
+          allow(Job.logger).to receive(:info)
+          expect(Job.logger).to receive(:info).with(/Failed to execute/)
           subject
         end
 

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

@@ -76,7 +76,7 @@ module PactBroker
           end
         end
 
-        context "when there is a scheduling error" do
+        context "when there is a scheduling error", job: true do
           before do
             allow(Job).to receive(:perform_in).and_raise("an error")
           end
@@ -166,7 +166,7 @@ module PactBroker
         end
       end
 
-      describe ".execute_webhook_now integration test" do
+      describe ".execute_webhook_now integration test", job: true do
         let(:td) { TestDataBuilder.new }
 
         let!(:http_request) do
@@ -215,7 +215,7 @@ module PactBroker
         end
       end
 
-      describe ".trigger_webhooks integration test" do
+      describe ".trigger_webhooks integration test", job: true do
         let!(:http_request) do
           stub_request(:get, "http://example.org").
             to_return(:status => 200)

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

@@ -0,0 +1,39 @@
+require 'pact_broker/webhooks/webhook'
+
+module PactBroker
+  module Webhooks
+    describe Webhook do
+
+      let(:td) { TestDataBuilder.new }
+
+      before do
+        td.create_consumer("Foo")
+          .create_provider("Bar")
+          .create_consumer_version
+          .create_pact
+          .create_global_webhook
+          .create_consumer_webhook
+          .create_provider_webhook
+          .create_provider("Wiffle")
+          .create_provider_webhook
+      end
+
+      let(:consumer) { PactBroker::Domain::Pacticipant.find(name: "Foo") }
+      let(:provider) { PactBroker::Domain::Pacticipant.find(name: "Bar") }
+      let(:pact) { double(consumer_id: consumer.id, provider_id: provider.id).as_null_object }
+
+      describe "#is_for?" do
+        let(:matching_webhook_uuids) { Webhooks::Repository.new.find_by_consumer_and_or_provider(consumer, provider).collect(&:uuid) }
+        let(:matching_webhooks) { Webhooks::Webhook.where(uuid: matching_webhook_uuids) }
+        let(:non_matching_webhooks) { Webhooks::Webhook.exclude(uuid: matching_webhook_uuids) }
+
+        it "matches the implementation of Webhook::Repository#find_by_consumer_and_or_provider" do
+          expect(matching_webhooks.count).to be > 0
+          expect(non_matching_webhooks.count).to be > 0
+          expect(matching_webhooks.all?{|w| w.is_for?(pact)}).to be true
+          expect(non_matching_webhooks.all?{|w| !w.is_for?(pact)}).to be true
+        end
+      end
+    end
+  end
+end

data/spec/lib/rack/pact_broker/database_transaction_spec.rb

@@ -50,6 +50,46 @@ module Rack
           expect { subject }.to change { ::PactBroker::Domain::Pacticipant.count }.by(1)
         end
       end
+
+      describe "setting the database connector" do
+        let(:api) { double('api', call: [200, {}, []]) }
+
+        it "sets a database connector for use in jobs scheduled by this request" do
+          expect(api).to receive(:call) do | env |
+            expect(Thread.current[:pact_broker_thread_data].database_connector).to_not be nil
+            [200, {}, []]
+          end
+
+          subject
+        end
+
+        it "clears it after the request" do
+          subject
+          expect(Thread.current[:pact_broker_thread_data].database_connector).to be nil
+        end
+
+        context "when other middleware sets the database connector" do
+          before do
+            Thread.current[:pact_broker_thread_data] = OpenStruct.new(database_connector: other_database_connector)
+          end
+
+          let(:other_database_connector) { ->(&block) { block.call } }
+
+          it "does not override it" do
+            expect(api).to receive(:call) do | env |
+              expect(Thread.current[:pact_broker_thread_data].database_connector).to eq other_database_connector
+              [200, {}, []]
+            end
+
+            subject
+          end
+
+          it "does not clear it after the request" do
+            subject
+            expect(Thread.current[:pact_broker_thread_data].database_connector).to_not be nil
+          end
+        end
+      end
     end
   end
 end

data/spec/service_consumers/pact_helper.rb

@@ -1,4 +1,6 @@
 $: << File.expand_path("../../../", __FILE__)
+
+require 'spec/support/simplecov'
 require 'pact/provider/rspec'
 require 'db'
 require 'tasks/database'

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
 $: << File.expand_path("../../", __FILE__)
 
 RACK_ENV = ENV['RACK_ENV'] = 'test'
-
-require 'simplecov'
-SimpleCov.start
+require 'spec/support/simplecov'
 
 require 'support/logging'
 require 'support/database'
@@ -45,6 +43,7 @@ RSpec.configure do | config |
 
   config.include FixtureHelpers
   config.example_status_persistence_file_path = "./spec/examples.txt"
+  config.filter_run_excluding skip: true
 
   def app
     PactBroker::API

data/spec/support/jobs.rb

@@ -0,0 +1,12 @@
+require 'ostruct'
+
+RSpec.configure do | config |
+  config.before(:each, job: true) do
+    Thread.current[:pact_broker_thread_data] = OpenStruct.new
+    Thread.current[:pact_broker_thread_data].database_connector = -> (&block) { block.call }
+  end
+
+  config.after(:each, job: true) do
+    Thread.current[:pact_broker_thread_data] = nil
+  end
+end

data/spec/support/migration_helpers.rb

@@ -11,6 +11,6 @@ module MigrationHelpers
   end
 
   def database
-    @database ||= DB.connection_for_env 'test'
+    @database ||= PactBroker::Database.database
   end
 end

data/spec/support/simplecov.rb

@@ -0,0 +1,10 @@
+require 'simplecov'
+
+SimpleCov.command_name ENV['SIMPLECOV_COMMAND_NAME'] if ENV['SIMPLECOV_COMMAND_NAME']
+SimpleCov.start do
+  add_filter '/db/'
+  add_filter '/example/'
+  add_filter '/spec/'
+  add_filter '/tasks/'
+  add_filter '/script/'
+end

data/tasks/audit.rake

@@ -0,0 +1,2 @@
+require 'bundler/audit/task'
+Bundler::Audit::Task.new

data/tasks/pact.rake

@@ -4,8 +4,12 @@ Pact::VerificationTask.new(:dev) do | pact |
   pact.uri "../pact_broker-client/spec/pacts/pact_broker_client-pact_broker.json"
 end
 
+task :set_simplecov_command_to_pact_verify do
+  ENV['SIMPLECOV_COMMAND_NAME'] = 'pact:verify'
+end
+
 namespace :pact do
-  task :prepare => ['db:set_test_env', 'db:prepare:test']
+  task :prepare => ['db:set_test_env', 'db:prepare:test', 'set_simplecov_command_to_pact_verify',]
   task :verify => :prepare
   task 'verify:at' => :prepare
   task 'verify:dev' => :prepare

data/tasks/rspec.rake

@@ -1,6 +1,10 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new('spec:focus') do |task|
+  task.rspec_opts = '--tag @focus'
+end
+
 RSpec::Core::RakeTask.new('spec:quick') do |task|
   task.rspec_opts = '--tag ~@no_db_clean --tag ~@migration'
 end
@@ -9,4 +13,14 @@ RSpec::Core::RakeTask.new('spec:slow') do |task|
   task.rspec_opts = '--tag @no_db_clean --tag @migration'
 end
 
+task :set_simplecov_command_to_spec_quick do
+  ENV['SIMPLECOV_COMMAND_NAME'] = 'spec:quick'
+end
+
+task :set_simplecov_command_to_spec_slow do
+  ENV['SIMPLECOV_COMMAND_NAME'] = 'spec:slow'
+end
+
+task 'spec:quick' => ['set_simplecov_command_to_spec_quick']
+task 'spec:slow' => ['set_simplecov_command_to_spec_slow']
 task :spec => ['spec:quick', 'spec:slow']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.27.6
+  version: 2.29.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -274,6 +274,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: dry-logic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -526,6 +540,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -553,6 +581,7 @@ files:
 - DEVELOPER_SETUP.md
 - Gemfile
 - LICENSE.txt
+- MATRIX.md
 - README.md
 - RELEASING.md
 - Rakefile
@@ -661,7 +690,6 @@ files:
 - db/migrations/20180731_update_head_matrix.rb
 - db/migrations/20180828_create_latest_versions.rb
 - db/migrations/migration_helper.rb
-- db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
 - db/test/backwards_compatibility/Gemfile
@@ -744,6 +772,7 @@ files:
 - lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/provider_pacts_decorator.rb
+- lib/pact_broker/api/decorators/reason_decorator.rb
 - lib/pact_broker/api/decorators/relationships_csv_decorator.rb
 - lib/pact_broker/api/decorators/representable_pact.rb
 - lib/pact_broker/api/decorators/tag_decorator.rb
@@ -894,7 +923,9 @@ files:
 - lib/pact_broker/matrix/parse_query.rb
 - lib/pact_broker/matrix/query_results.rb
 - lib/pact_broker/matrix/query_results_with_deployment_status_summary.rb
+- lib/pact_broker/matrix/reason.rb
 - lib/pact_broker/matrix/repository.rb
+- lib/pact_broker/matrix/resolved_selector.rb
 - lib/pact_broker/matrix/row.rb
 - lib/pact_broker/matrix/service.rb
 - lib/pact_broker/messages.rb
@@ -948,6 +979,7 @@ files:
 - lib/pact_broker/ui/view_models/matrix_tag.rb
 - lib/pact_broker/ui/views/clusters/show.haml
 - lib/pact_broker/ui/views/groups/show.html.erb
+- lib/pact_broker/ui/views/index/_navbar.haml
 - lib/pact_broker/ui/views/index/show-with-tags.haml
 - lib/pact_broker/ui/views/index/show.haml
 - lib/pact_broker/ui/views/layouts/main.haml
@@ -1049,11 +1081,13 @@ files:
 - script/recreate-pg-db.sh
 - script/recreate-test-database.sh
 - script/release.sh
+- script/restart.sh
 - script/run-with-ssl.rb
 - script/seed-example-matrix.rb
 - script/seed-matrix.rb
 - script/seed.rb
 - script/update-hal-browser
+- script/watch.sh
 - script/webhook-server.ru
 - spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/create_pacticipant_spec.rb
@@ -1144,6 +1178,7 @@ files:
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/reason_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
 - spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb
@@ -1219,8 +1254,9 @@ files:
 - spec/lib/pact_broker/matrix/aggregated_row_spec.rb
 - spec/lib/pact_broker/matrix/deployment_status_summary_spec.rb
 - spec/lib/pact_broker/matrix/head_row_spec.rb
+- spec/lib/pact_broker/matrix/integration_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
-- spec/lib/pact_broker/matrix/repository_find_integrations_spec.rb
+- spec/lib/pact_broker/matrix/repository_dependency_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/row_spec.rb
 - spec/lib/pact_broker/matrix/service_spec.rb
@@ -1265,6 +1301,7 @@ files:
 - spec/lib/pact_broker/webhooks/status_spec.rb
 - spec/lib/pact_broker/webhooks/triggered_webhook_spec.rb
 - spec/lib/pact_broker/webhooks/webhook_request_template_spec.rb
+- spec/lib/pact_broker/webhooks/webhook_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
 - spec/lib/rack/pact_broker/add_pact_broker_version_header_spec.rb
 - spec/lib/rack/pact_broker/database_transaction_spec.rb
@@ -1294,6 +1331,7 @@ files:
 - spec/support/generated_markdown.md
 - spec/support/interaction_view_model.json
 - spec/support/interaction_view_model_with_terms.json
+- spec/support/jobs.rb
 - spec/support/logging.rb
 - spec/support/markdown_pact.json
 - spec/support/markdown_pact_with_markdown_chars_in_names.json
@@ -1302,9 +1340,11 @@ files:
 - spec/support/rspec_matchers.rb
 - spec/support/shared_context.rb
 - spec/support/shared_examples_for_responses.rb
+- spec/support/simplecov.rb
 - spec/support/ssl_webhook_server.rb
 - spec/support/test_data_builder.rb
 - spec/support/warning_silencer.rb
+- tasks/audit.rake
 - tasks/database.rb
 - tasks/database/annotate.rb
 - tasks/database/table_dependency_calculator.rb
@@ -1466,6 +1506,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/reason_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
 - spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb
@@ -1541,8 +1582,9 @@ test_files:
 - spec/lib/pact_broker/matrix/aggregated_row_spec.rb
 - spec/lib/pact_broker/matrix/deployment_status_summary_spec.rb
 - spec/lib/pact_broker/matrix/head_row_spec.rb
+- spec/lib/pact_broker/matrix/integration_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
-- spec/lib/pact_broker/matrix/repository_find_integrations_spec.rb
+- spec/lib/pact_broker/matrix/repository_dependency_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/row_spec.rb
 - spec/lib/pact_broker/matrix/service_spec.rb
@@ -1587,6 +1629,7 @@ test_files:
 - spec/lib/pact_broker/webhooks/status_spec.rb
 - spec/lib/pact_broker/webhooks/triggered_webhook_spec.rb
 - spec/lib/pact_broker/webhooks/webhook_request_template_spec.rb
+- spec/lib/pact_broker/webhooks/webhook_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
 - spec/lib/rack/pact_broker/add_pact_broker_version_header_spec.rb
 - spec/lib/rack/pact_broker/database_transaction_spec.rb
@@ -1616,6 +1659,7 @@ test_files:
 - spec/support/generated_markdown.md
 - spec/support/interaction_view_model.json
 - spec/support/interaction_view_model_with_terms.json
+- spec/support/jobs.rb
 - spec/support/logging.rb
 - spec/support/markdown_pact.json
 - spec/support/markdown_pact_with_markdown_chars_in_names.json
@@ -1624,6 +1668,7 @@ test_files:
 - spec/support/rspec_matchers.rb
 - spec/support/shared_context.rb
 - spec/support/shared_examples_for_responses.rb
+- spec/support/simplecov.rb
 - spec/support/ssl_webhook_server.rb
 - spec/support/test_data_builder.rb
 - spec/support/warning_silencer.rb