pact_broker 2.76.2 → 2.77.0

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

@@ -23,6 +23,8 @@ module PactBroker
         it "sets the properties" do
           expect(subject.name).to eq "prod"
           expect(subject.version.id).to eq td.version.id
+          expect(subject.version_order).to eq td.version.order
+          expect(subject.pacticipant_id).to eq td.version.pacticipant_id
         end
 
         context "when the tag already exists" do

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

@@ -122,6 +122,50 @@ module PactBroker
           end
         end
       end
+
+      describe "#create_or_update" do
+        before do
+          td.subtract_day
+            .create_consumer("Foo")
+            .create_consumer_version(version_number, branch: "original-branch", build_url: "original-build-url")
+            .create_consumer_version_tag("dev")
+        end
+
+        let(:pacticipant) { td.and_return(:consumer) }
+        let(:version_number) { "1234" }
+        let(:version) { PactBroker::Domain::Version.new(branch: "new-branch") }
+
+        subject { Repository.new.create_or_update(pacticipant, version_number, version) }
+
+        it "overwrites the values" do
+          expect(subject.branch).to eq "new-branch"
+          expect(subject.build_url).to eq nil
+        end
+
+        it "does not change the tags" do
+          expect { subject }.to_not change { PactBroker::Domain::Version.for("Foo", "1234").tags }
+        end
+
+        it "does not change the created date" do
+          expect { subject }.to_not change { PactBroker::Domain::Version.for("Foo", "1234").created_at }
+        end
+
+        it "does change the updated date" do
+          expect { subject }.to change { PactBroker::Domain::Version.for("Foo", "1234").updated_at }
+        end
+
+        it "maintains the order" do
+          expect { subject }.to_not change { PactBroker::Domain::Version.for("Foo", "1234").order }
+        end
+
+        context "when the version does not already exist" do
+          let(:version) { PactBroker::Domain::Version.new(number: "555", branch: "new-branch") }
+
+          it "sets the order" do
+            expect(subject.order).to_not be nil
+          end
+        end
+      end
     end
   end
 end

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

@@ -129,6 +129,14 @@ module PactBroker
           end
         end
 
+        context "when the response code '100' is not in 'webhook_http_code_success'" do
+          let(:status) { 100 }
+
+          it "not successful, code '100' not in 'webhook_http_code_success'" do
+            expect(logs).to include "oops"
+          end
+        end
+
         context "when the response code is not successful" do
           let(:status) { 400 }
 

data/spec/lib/sequel/plugins/upsert_spec.rb

@@ -24,6 +24,12 @@ module Sequel
         plugin :upsert, identifying_columns: [:provider_id, :consumer_version_id]
       end
 
+      describe PacticipantNoUpsert do
+        it "has an _insert_dataset method" do
+          expect(PacticipantNoUpsert.private_instance_methods).to include (:_insert_dataset)
+        end
+      end
+
       describe "LatestPactPublicationIdForConsumerVersion" do
         before do
           td.create_pact_with_hierarchy("Foo", "1", "Bar")
@@ -102,10 +108,20 @@ module Sequel
 
       context "when a duplicate Version is inserted with upsert" do
         let!(:pacticipant) { Pacticipant.new(name: "Foo").save }
-        let!(:original_version) { Version.new(number: "1", pacticipant_id: pacticipant.id).upsert }
+        let!(:original_version) do
+          version = Version.new(
+            number: "1",
+            pacticipant_id: pacticipant.id,
+            branch: "original-branch",
+            build_url: "original-url"
+          ).upsert
+          Version.where(id: version.id).update(created_at: yesterday, updated_at: yesterday)
+          version
+        end
+        let(:yesterday) { DateTime.now - 2 }
 
         subject do
-          Version.new(number: "1", pacticipant_id: pacticipant.id).upsert
+          Version.new(number: "1", pacticipant_id: pacticipant.id, branch: "new-branch").upsert
         end
 
         it "does not raise an error" do
@@ -113,12 +129,24 @@ module Sequel
         end
 
         it "sets the values on the object" do
-          expect(subject.id).to eq original_version.id
+          expect(subject.branch).to eq "new-branch"
+        end
+
+        it "nils out values that weren't set on the second model" do
+          expect(subject.build_url).to eq nil
         end
 
         it "does not insert another row" do
           expect { subject }.to_not change { Version.count }
         end
+
+        it "does not change the created_at" do
+          expect { subject }.to_not change { Version.where(number: "1").first.created_at }
+        end
+
+        it "does change the updated_at" do
+          expect { subject }.to change { Version.where(number: "1").first.updated_at }
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+# Can't stop the gression tests loading the spec_helper becaues of the .rspec file
+# At least we can avoid executing it.
+return if ENV["REGRESSION"] == "true"
+
 $: << File.expand_path("../../", __FILE__)
 
 RACK_ENV = ENV['RACK_ENV'] = 'test'
@@ -12,7 +16,6 @@ require 'rspec/pact/matchers'
 require 'sucker_punch/testing/inline'
 require 'webmock/rspec'
 require 'pact_broker/policies'
-require 'approvals/rspec'
 
 Dir.glob("./spec/support/**/*.rb") { |file| require file  }
 
@@ -20,10 +23,6 @@ WebMock.disable_net_connect!(allow_localhost: true)
 
 I18n.config.enforce_available_locales = false
 
-Approvals.configure do |c|
-  c.approvals_path = 'spec/fixtures/approvals/'
-end
-
 RSpec.configure do | config |
   config.before :each do
     PactBroker.reset_configuration
@@ -53,6 +52,19 @@ RSpec.configure do | config |
   config.example_status_persistence_file_path = "./spec/examples.txt"
   config.filter_run_excluding skip: true
 
+  config.after(:each) do | example, something |
+    if example.exception.is_a?(Approvals::ApprovalError)
+      require "pact/support"
+      parts = example.exception.message.split('"')
+      received_file = parts[1]
+      approved_file = parts[3]
+      received_hash = JSON.parse(File.read(received_file))
+      approved_hash = JSON.parse(File.read(approved_file))
+      diff = Pact::Matchers.diff(approved_hash, received_hash)
+      puts Pact::Matchers::UnixDiffFormatter.call(diff)
+    end
+  end
+
   def app
     PactBroker::API
   end

data/spec/support/approvals.rb

@@ -0,0 +1,24 @@
+require 'approvals/rspec'
+require 'pact/support'
+
+Approvals.configure do |c|
+  c.approvals_path = 'spec/fixtures/approvals/'
+end
+
+def print_diff(exception)
+  parts = exception.message.split('"')
+  received_file = parts[1]
+  approved_file = parts[3]
+  received_hash = JSON.parse(File.read(received_file))
+  approved_hash = JSON.parse(File.read(approved_file))
+  diff = Pact::Matchers.diff(approved_hash, received_hash)
+  puts Pact::Matchers::UnixDiffFormatter.call(diff)
+end
+
+RSpec.configure do | config |
+  config.after(:each) do | example |
+    if example.exception.is_a?(Approvals::ApprovalError)
+      print_diff(example.exception)
+    end
+  end
+end

data/tasks/db.rake

@@ -98,6 +98,7 @@ namespace :db do
   desc 'Annotate the Sequel domain classes with schema information'
   task :annotate do
     begin
+      raise "Need to set INSTALL_PG=true" unless ENV["INSTALL_PG"] == "true"
       ENV['RACK_ENV'] = 'test'
       ENV['DATABASE_ADAPTER'] = 'docker_postgres'
       load 'tasks/docker_database.rb'

data/tasks/rspec.rake

@@ -11,7 +11,7 @@ end
 
 RSpec::Core::RakeTask.new('regression') do |task|
   task.pattern = 'regression/**{,/*/**}/*_spec.rb'
-  task.rspec_opts = '--require regression/regression_helper.rb'
+  task.rspec_opts = '--require ./regression/regression_helper.rb'
 end
 
 RSpec::Core::RakeTask.new('spec:slow') do |task|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.76.2
+  version: 2.77.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -373,6 +373,7 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/release_gem.yml"
+- ".github/workflows/test-ruby-3.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".optic/.gitignore"
@@ -407,6 +408,7 @@ files:
 - db/ddl_statements/latest_pact_consumer_version_orders.rb
 - db/ddl_statements/latest_pact_publications_by_consumer_versions.rb
 - db/ddl_statements/latest_tagged_pact_consumer_version_orders.rb
+- db/ddl_statements/latest_tagged_pact_publications.rb
 - db/ddl_statements/latest_triggered_webhooks.rb
 - db/ddl_statements/latest_verification_ids_for_consumer_and_provider.rb
 - db/ddl_statements/latest_verification_ids_for_consumer_version_tags.rb
@@ -532,6 +534,12 @@ files:
 - db/migrations/20201026_update_latest_verification_ids_for_consumer_and_provider.rb
 - db/migrations/20210115_add_webhook_foreign_key_indexes.rb
 - db/migrations/20210116_add_context_to_triggered_webhook.rb
+- db/migrations/20210117_add_branch_to_version.rb
+- db/migrations/20210202_add_created_at_to_head_pact_tags.rb
+- db/migrations/20210205_add_pacticipant_id_to_tag.rb
+- db/migrations/20210206_add_index_to_tags_and_versions.rb
+- db/migrations/20210207_optimise_latest_verification_ids_for_consumer_version_tags.rb
+- db/migrations/20210208_optimise_latest_tagged_pact_cv_orders.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -681,6 +689,7 @@ files:
 - lib/pact_broker/api/resources/latest_verification_for_latest_pact.rb
 - lib/pact_broker/api/resources/latest_verification_for_pact.rb
 - lib/pact_broker/api/resources/latest_verifications_for_consumer_version.rb
+- lib/pact_broker/api/resources/latest_version.rb
 - lib/pact_broker/api/resources/matrix.rb
 - lib/pact_broker/api/resources/matrix_badge.rb
 - lib/pact_broker/api/resources/matrix_for_consumer_and_provider.rb
@@ -725,6 +734,7 @@ files:
 - lib/pact_broker/config/repository.rb
 - lib/pact_broker/config/save.rb
 - lib/pact_broker/config/setting.rb
+- lib/pact_broker/config/space_delimited_integer_list.rb
 - lib/pact_broker/config/space_delimited_string_list.rb
 - lib/pact_broker/configuration.rb
 - lib/pact_broker/constants.rb
@@ -739,6 +749,7 @@ files:
 - lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications.rb
 - lib/pact_broker/db/data_migrations/set_created_at_for_latest_pact_publications.rb
 - lib/pact_broker/db/data_migrations/set_created_at_for_latest_verifications.rb
+- lib/pact_broker/db/data_migrations/set_extra_columns_for_tags.rb
 - lib/pact_broker/db/data_migrations/set_latest_version_sequence_value.rb
 - lib/pact_broker/db/data_migrations/set_pacticipant_ids_for_verifications.rb
 - lib/pact_broker/db/data_migrations/set_webhooks_enabled.rb
@@ -768,6 +779,7 @@ files:
 - lib/pact_broker/doc/views/index/latest-tagged-version.markdown
 - lib/pact_broker/doc/views/index/latest-version.markdown
 - lib/pact_broker/doc/views/index/pacticipant-version-tag.markdown
+- lib/pact_broker/doc/views/index/pacticipant-version.markdown
 - lib/pact_broker/doc/views/index/pacticipants.markdown
 - lib/pact_broker/doc/views/index/provider-pacts-with-tag.markdown
 - lib/pact_broker/doc/views/index/provider-pacts.markdown
@@ -854,6 +866,7 @@ files:
 - lib/pact_broker/pacts/content.rb
 - lib/pact_broker/pacts/create_formatted_diff.rb
 - lib/pact_broker/pacts/diff.rb
+- lib/pact_broker/pacts/eager_loaders.rb
 - lib/pact_broker/pacts/generate_interaction_sha.rb
 - lib/pact_broker/pacts/generate_sha.rb
 - lib/pact_broker/pacts/head_pact.rb
@@ -861,12 +874,15 @@ files:
 - lib/pact_broker/pacts/latest_pact_publications.rb
 - lib/pact_broker/pacts/latest_pact_publications_by_consumer_version.rb
 - lib/pact_broker/pacts/latest_tagged_pact_publications.rb
+- lib/pact_broker/pacts/lazy_loaders.rb
 - lib/pact_broker/pacts/merger.rb
 - lib/pact_broker/pacts/metadata.rb
 - lib/pact_broker/pacts/order_hash_keys.rb
 - lib/pact_broker/pacts/pact_params.rb
 - lib/pact_broker/pacts/pact_publication.rb
+- lib/pact_broker/pacts/pact_publication_dataset_module.rb
 - lib/pact_broker/pacts/pact_version.rb
+- lib/pact_broker/pacts/pacts_for_verification_repository.rb
 - lib/pact_broker/pacts/parse.rb
 - lib/pact_broker/pacts/placeholder_pact.rb
 - lib/pact_broker/pacts/repository.rb
@@ -885,6 +901,7 @@ files:
 - lib/pact_broker/repositories/helpers.rb
 - lib/pact_broker/services.rb
 - lib/pact_broker/string_refinements.rb
+- lib/pact_broker/tags/eager_loaders.rb
 - lib/pact_broker/tags/head_pact_tags.rb
 - lib/pact_broker/tags/repository.rb
 - lib/pact_broker/tags/service.rb
@@ -937,7 +954,9 @@ files:
 - lib/pact_broker/verifications/summary_for_consumer_version.rb
 - lib/pact_broker/version.rb
 - lib/pact_broker/versions/abbreviate_number.rb
+- lib/pact_broker/versions/eager_loaders.rb
 - lib/pact_broker/versions/latest_version.rb
+- lib/pact_broker/versions/lazy_loaders.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/sequence.rb
@@ -1055,9 +1074,13 @@ files:
 - public/stylesheets/pact.css
 - regression/.gitignore
 - regression/can_i_deploy_spec.rb
+- regression/index_spec.rb
 - regression/regression_helper.rb
 - regression/script/approval-all.sh
+- regression/script/clear.sh
+- regression/script/run.sh
 - script/db-spec.sh
+- script/demonstrate-version-branches.rb
 - script/docker-container/test.sh
 - script/docker/db-execute-sql-file.sh
 - script/docker/db-psql.sh
@@ -1107,6 +1130,7 @@ files:
 - spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/can_i_deploy_spec.rb
 - spec/features/create_pacticipant_spec.rb
+- spec/features/create_version_spec.rb
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_integration_spec.rb
 - spec/features/delete_label_spec.rb
@@ -1271,6 +1295,7 @@ files:
 - spec/lib/pact_broker/config/load_spec.rb
 - spec/lib/pact_broker/config/save_and_load_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
+- spec/lib/pact_broker/config/space_delimited_integer_list_spec.rb
 - spec/lib/pact_broker/config/space_delimited_string_list_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_incremental_spec.rb
@@ -1333,10 +1358,12 @@ files:
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb
 - spec/lib/pact_broker/pacts/repository_find_for_verification_fallback_spec.rb
 - spec/lib/pact_broker/pacts/repository_find_for_verification_spec.rb
+- spec/lib/pact_broker/pacts/repository_find_wip_pact_versions_for_provider_branch_spec.rb
 - spec/lib/pact_broker/pacts/repository_find_wip_pact_versions_for_provider_spec.rb
 - spec/lib/pact_broker/pacts/repository_spec.rb
 - spec/lib/pact_broker/pacts/selected_pact_spec.rb
@@ -1404,6 +1431,7 @@ files:
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/service_consumers/provider_states_for_pact_ruby.rb
 - spec/spec_helper.rb
+- spec/support/approvals.rb
 - spec/support/database.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
@@ -1501,7 +1529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: See description
@@ -1509,6 +1537,7 @@ test_files:
 - spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/can_i_deploy_spec.rb
 - spec/features/create_pacticipant_spec.rb
+- spec/features/create_version_spec.rb
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_integration_spec.rb
 - spec/features/delete_label_spec.rb
@@ -1673,6 +1702,7 @@ test_files:
 - spec/lib/pact_broker/config/load_spec.rb
 - spec/lib/pact_broker/config/save_and_load_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
+- spec/lib/pact_broker/config/space_delimited_integer_list_spec.rb
 - spec/lib/pact_broker/config/space_delimited_string_list_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_incremental_spec.rb
@@ -1735,10 +1765,12 @@ test_files:
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb
 - spec/lib/pact_broker/pacts/repository_find_for_verification_fallback_spec.rb
 - spec/lib/pact_broker/pacts/repository_find_for_verification_spec.rb
+- spec/lib/pact_broker/pacts/repository_find_wip_pact_versions_for_provider_branch_spec.rb
 - spec/lib/pact_broker/pacts/repository_find_wip_pact_versions_for_provider_spec.rb
 - spec/lib/pact_broker/pacts/repository_spec.rb
 - spec/lib/pact_broker/pacts/selected_pact_spec.rb
@@ -1806,6 +1838,7 @@ test_files:
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/service_consumers/provider_states_for_pact_ruby.rb
 - spec/spec_helper.rb
+- spec/support/approvals.rb
 - spec/support/database.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb