pact_broker 2.69.0 → 2.70.0

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

@@ -4,17 +4,13 @@ require 'pact_broker/groups/service'
 require 'rack/test'
 
 module PactBroker::Api
-
   module Resources
-
     describe Group do
-
       include Rack::Test::Methods
 
       let(:app) { PactBroker::API }
 
       describe "GET" do
-
         let(:group) { double('group') }
         let(:decorator) { instance_double(PactBroker::Api::Decorators::RelationshipsCsvDecorator) }
         let(:csv) { 'csv' }
@@ -60,7 +56,6 @@ module PactBroker::Api
             subject
             expect(last_response.body).to eq csv
           end
-
         end
 
         context "when the pacticipant does not exist" do
@@ -72,9 +67,16 @@ module PactBroker::Api
           end
         end
 
-      end
+        context "when there is no group because the pacticipant isn't integrated with any other pacticipants" do
+          let(:group) { nil }
 
+          it "returns an empty body" do
+            expect(subject.status).to eq 200
+            expect(last_response.headers['Content-Type']).to eq 'text/csv;charset=utf-8'
+            expect(subject.body).to eq ""
+          end
+        end
+      end
     end
   end
-
 end

data/spec/lib/pact_broker/db/clean_incremental_spec.rb

@@ -0,0 +1,93 @@
+require 'pact_broker/db/clean_incremental'
+require 'pact_broker/matrix/unresolved_selector'
+
+IS_MYSQL = !!DB.mysql?
+
+module PactBroker
+  module DB
+    # Inner queries don't work on MySQL. Seriously, MySQL???
+    describe CleanIncremental, pending: IS_MYSQL  do
+
+      def pact_publication_count_for(consumer_name, version_number)
+        PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name(consumer_name).where(number: version_number)).count
+      end
+
+      let(:options) { {} }
+      let(:db) { PactBroker::DB.connection }
+
+      subject { CleanIncremental.call(PactBroker::DB.connection, options) }
+      let(:latest_dev_selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: "dev", latest: true) }
+      let(:all_prod_selector) { PactBroker::Matrix::UnresolvedSelector.new(tag: "prod") }
+      let(:limit) { 3 }
+
+      describe ".call"do
+        context "when there are specified versions to keep" do
+          before do
+            td.create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_consumer_version_tag("prod").comment("keep as one of prod")
+              .create_consumer_version_tag("dev")
+              .add_day
+              .create_consumer_version("2").comment("DELETE")
+              .add_day
+              .create_consumer_version("3", tag_names: %w{prod}).comment("keep as one of prod")
+              .create_pact
+              .add_day
+              .create_consumer_version("4", tag_names: %w{dev}).comment("DELETE as not latest")
+              .create_pact
+              .add_day
+              .create_consumer_version("5", tag_names: %w{dev}).comment("keep as latest dev")
+              .create_pact
+              .add_day
+              .create_consumer_version("6", tag_names: %w{foo}).comment("DELETE as not specified")
+              .create_pact
+              .add_day
+              .create_consumer_version("7").comment("keep as deletion limit is 3")
+              .create_pact
+          end
+
+          let(:options) { { keep: [all_prod_selector, latest_dev_selector], limit: limit } }
+
+          it "does not delete the consumer versions specified" do
+            expect(PactBroker::Domain::Version.where(number: "1").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "2").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "3").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "4").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "5").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "6").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "7").count).to be 1
+            subject
+            expect(PactBroker::Domain::Version.where(number: "1").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "2").count).to be 0
+            expect(PactBroker::Domain::Version.where(number: "3").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "4").count).to be 0
+            expect(PactBroker::Domain::Version.where(number: "5").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "6").count).to be 0
+            expect(PactBroker::Domain::Version.where(number: "7").count).to be 1
+          end
+        end
+
+        context "with orphan pact versions" do
+          before do
+            # Create a pact that will not be deleted
+            td.create_pact_with_hierarchy("Foo", "0", "Bar", json_content_1)
+              .create_consumer_version_tag("dev")
+            # Create an orphan pact version
+            pact_version_params = PactBroker::Pacts::PactVersion.first.to_hash
+            pact_version_params.delete(:id)
+            pact_version_params[:sha] = "1234"
+            PactBroker::Pacts::PactVersion.create(pact_version_params)
+          end
+
+          let(:json_content_1) { { interactions: ['a', 'b']}.to_json }
+          let(:json_content_2) { { interactions: ['a', 'c']}.to_json }
+
+          let(:options) { { keep: [latest_dev_selector] } }
+
+          it "deletes them" do
+            expect { subject }.to change { PactBroker::Pacts::PactVersion.count }.by(-1)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/domain/tag_spec.rb

@@ -0,0 +1,46 @@
+require 'pact_broker/domain/tag'
+
+module PactBroker
+  module Domain
+    describe Tag do
+      before do
+        td.create_consumer("foo")
+          .create_consumer_version("1")
+          .create_consumer_version_tag("dev")
+          .create_consumer_version_tag("prod")
+          .create_consumer_version("2")
+          .create_consumer_version_tag("dev")
+          .create_consumer_version_tag("bloop")
+          .create_consumer_version("3")
+          .create_consumer_version_tag("dev")
+          .create_consumer("bar")
+          .create_consumer_version("1")
+          .create_consumer_version_tag("test")
+      end
+
+      it "returns the latest tags for the given pacticipant ids" do
+        pacticipant = PactBroker::Domain::Pacticipant.order(:id).first
+        tags = Tag.latest_tags_for_pacticipant_ids([pacticipant.id]).all
+        expect(tags.collect(&:name).sort).to eq %w{bloop dev prod}
+        expect(tags.find{ |t| t.name == "dev" }.version.number).to eq "3"
+        expect(tags.find{ |t| t.name == "prod" }.version.number).to eq "1"
+        expect(tags.find{ |t| t.name == "bloop" }.version.number).to eq "2"
+        expect(tags.collect(&:version_id).compact.size).to eq 3
+        expect(tags.collect(&:created_at).compact.size).to eq 3
+      end
+    end
+  end
+end
+
+# Table: tags
+# Primary Key: (name, version_id)
+# Columns:
+#  name       | text                        |
+#  version_id | integer                     |
+#  created_at | timestamp without time zone | NOT NULL
+#  updated_at | timestamp without time zone | NOT NULL
+# Indexes:
+#  tags_pk      | PRIMARY KEY btree (version_id, name)
+#  ndx_tag_name | btree (name)
+# Foreign key constraints:
+#  tags_version_id_fkey | (version_id) REFERENCES versions(id)

data/spec/lib/pact_broker/domain/verification_spec.rb

@@ -4,6 +4,19 @@ module PactBroker
 
   module Domain
     describe Verification do
+      describe "delete" do
+        before do
+          td.create_pact_with_hierarchy("Foo", "1", "Bar")
+            .create_verification_webhook
+            .create_verification(provider_version: "2")
+            .create_triggered_webhook
+            .create_webhook_execution
+        end
+
+        it "deletes stuff" do
+          Verification.delete
+        end
+      end
 
       describe "#save" do
         let!(:verification) do

data/spec/lib/pact_broker/domain/version_spec.rb

@@ -172,6 +172,29 @@ module PactBroker
             .to raise_error(Sequel::UniqueConstraintViolation)
         end
       end
+
+      describe "tags_with_latest_flag" do
+        before do
+          td.create_consumer("foo")
+            .create_consumer_version("1")
+            .create_consumer_version_tag("dev")
+            .create_consumer_version_tag("prod")
+            .create_consumer_version("2")
+            .create_consumer_version_tag("dev")
+        end
+
+        it "uneager loads" do
+          version = Version.first(number: "1")
+          expect(version.tags.collect(&:name).sort).to eq %w{dev prod}
+          expect(version.tags_with_latest_flag.select(&:latest).collect(&:name)).to eq %w{prod}
+        end
+
+        it "eager loads" do
+          version = Version.eager(:tags, :tags_with_latest_flag).where(number: "1").all.first
+          expect(version.tags.collect(&:name).sort).to eq %w{dev prod}
+          expect(version.tags_with_latest_flag.select(&:latest).collect(&:name)).to eq %w{prod}
+        end
+      end
     end
   end
 end

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

@@ -113,9 +113,11 @@ module PactBroker
             .create_pact
             .create_consumer_version("5.6.7")
             .create_consumer_version_tag("no")
+            .create_consumer("Foo2")
+            .create_consumer_version("3.4.5")
+            .create_consumer_version_tag("yes", comment: "actually no, just here to make sure it selects the right one")
         end
 
-        let(:td) { TestDataBuilder.new }
         let(:pact_publication) { PactPublication.find(id: td.pact.id) }
 
         context "when the pact is the latest for a tag" do

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

@@ -228,17 +228,30 @@ module PactBroker
           end
         end
 
-        context "when the provider tag does not exist yet" do
+        context "when the provider tag does not exist yet and there are no provider versions" do
           before do
             td.create_pact_with_hierarchy("foo", "1", "bar")
               .create_consumer_version_tag("feat-x")
           end
 
+          it "is included" do
+            expect(subject.size).to be 1
+          end
+        end
+
+        context "when the provider tag does not exist yet but there are other provider versions" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("feat-x")
+              .create_provider_version("1")
+          end
+
           it "doesn't return any pacts" do
             expect(subject.size).to be 0
           end
         end
 
+
         context "when a pact was published between the first creation date of two provider tags" do
           let(:provider_tags) { %w[dev feat-1] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.69.0
+  version: 2.70.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -174,16 +174,22 @@ dependencies:
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.4
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
@@ -367,6 +373,7 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/release_gem.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -379,6 +386,7 @@ files:
 - DEVELOPER_SETUP.md
 - Dockerfile
 - Gemfile
+- ISSUES.md
 - LICENSE.txt
 - MATRIX.md
 - README.md
@@ -648,6 +656,7 @@ files:
 - lib/pact_broker/api/resources/can_i_deploy.rb
 - lib/pact_broker/api/resources/can_i_deploy_badge.rb
 - lib/pact_broker/api/resources/can_i_deploy_pacticipant_version.rb
+- lib/pact_broker/api/resources/clean.rb
 - lib/pact_broker/api/resources/dashboard.rb
 - lib/pact_broker/api/resources/default_base_resource.rb
 - lib/pact_broker/api/resources/error_handler.rb
@@ -711,6 +720,7 @@ files:
 - lib/pact_broker/date_helper.rb
 - lib/pact_broker/db.rb
 - lib/pact_broker/db/clean.rb
+- lib/pact_broker/db/clean_incremental.rb
 - lib/pact_broker/db/data_migrations/delete_deprecated_webhook_executions.rb
 - lib/pact_broker/db/data_migrations/helpers.rb
 - lib/pact_broker/db/data_migrations/migrate_webhook_headers.rb
@@ -1217,6 +1227,7 @@ files:
 - spec/lib/pact_broker/config/save_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
 - spec/lib/pact_broker/db/clean_old_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/data_migrations/migrate_webhook_headers_spec.rb
@@ -1234,6 +1245,7 @@ files:
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pact_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
+- spec/lib/pact_broker/domain/tag_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
 - spec/lib/pact_broker/domain/version_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
@@ -1612,6 +1624,7 @@ test_files:
 - spec/lib/pact_broker/config/save_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
 - spec/lib/pact_broker/db/clean_old_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/data_migrations/migrate_webhook_headers_spec.rb
@@ -1629,6 +1642,7 @@ test_files:
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pact_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
+- spec/lib/pact_broker/domain/tag_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
 - spec/lib/pact_broker/domain/version_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb