pact_broker 2.40.0 → 2.41.0

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

@@ -99,12 +99,14 @@ module PactBroker
         context "when the pact is the latest for a tag" do
           it "returns the relevant tag names" do
             expect(pact_publication.head_tag_names).to eq ["yes"]
+            expect(pact_publication.head_pact_tags.collect(&:name)).to eq ["yes"]
           end
         end
 
         context "when the pact is not the latest for a tag" do
           it "returns the relevant tag names" do
             expect(pact_publication.head_tag_names).to eq ["yes"]
+            expect(pact_publication.head_pact_tags.collect(&:name)).to eq ["yes"]
           end
         end
       end

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

@@ -6,9 +6,11 @@ module PactBroker
       let(:td) { TestDataBuilder.new }
 
       describe "find_wip_pact_versions_for_provider" do
-
         let(:provider_tags) { %w[dev] }
-        subject { Repository.new.find_wip_pact_versions_for_provider("bar", provider_tags) }
+        let(:options) { { include_wip_pacts_since: include_wip_pacts_since } }
+        let(:include_wip_pacts_since) { (Date.today - 1).to_datetime }
+
+        subject { Repository.new.find_wip_pact_versions_for_provider("bar", provider_tags, options) }
 
         context "when there are no tags" do
           let(:provider_tags) { [] }
@@ -118,6 +120,19 @@ module PactBroker
             expect(subject.size).to be 0
           end
         end
+
+        context "when the pact was published before the specified include_wip_pacts_since" do
+          before do
+            td.create_pact_with_hierarchy("foo", "1", "bar")
+              .create_consumer_version_tag("prod")
+          end
+
+          let(:include_wip_pacts_since) { (Date.today + 3).to_datetime }
+
+          it "is not included" do
+            expect(subject.size).to be 0
+          end
+        end
       end
     end
   end

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

@@ -155,6 +155,62 @@ module PactBroker
           }.by(-1)
         end
       end
+
+      describe "find_for_verification integration test" do
+        before do
+          td.create_pact_with_hierarchy("Foo", "1", "Bar")
+            .create_consumer_version_tag("feat-1", comment: "latest for feat-1")
+            .create_consumer_version("2")
+            .create_pact(comment: "overall latest")
+            .create_consumer_version("3")
+        end
+
+        let(:options) { { } }
+
+        subject { Service.find_for_verification("Bar", ["master"], [], options) }
+
+
+        context "when the consumer version tags are empty" do
+          it "returns the latest overall pact for the consumer" do
+            expect(subject.first.consumer_version_number).to eq "2"
+            expect(subject.first.wip).to be false
+          end
+        end
+
+        context "when include_wip_pacts_since is not specified" do
+          it "does not include the WIP pacts" do
+            expect(subject.size).to eq 1
+          end
+        end
+
+        context "when WIP pacts are included" do
+          let(:options) do
+            {
+              include_wip_pacts_since: (Date.today - 1).to_datetime
+            }
+          end
+          it "returns the WIP pacts as well as the specified pacts" do
+            expect(subject.size).to eq 2
+            expect(subject.last.consumer_version_number).to eq "1"
+            expect(subject.last.wip).to be true
+          end
+
+          context "when the WIP pact has the same content as a specified pact" do
+            before do
+              td.create_pact_with_hierarchy("Blah", "1", "Wiffle")
+                .create_consumer_version_tag("feat-1", comment: "latest for feat-1")
+                .create_consumer_version("2")
+                .republish_same_pact(comment: "overall latest")
+            end
+
+            subject { Service.find_for_verification("Wiffle", ["master"], [], options) }
+
+            it "is not included" do
+              expect(subject.size).to eq 1
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module PactBroker
       let(:pending_provider_tags) { [] }
       let(:non_pending_provider_tags) { [] }
       let(:pending) { false }
+      let(:wip) { false }
       let(:verifiable_pact) do
         double(VerifiablePact,
           head_consumer_tags: head_consumer_tags,
@@ -15,7 +16,8 @@ module PactBroker
           provider_name: "Bar",
           pending_provider_tags: pending_provider_tags,
           non_pending_provider_tags: non_pending_provider_tags,
-          pending?: pending
+          pending?: pending,
+          wip?: wip
         )
       end
 
@@ -45,6 +47,15 @@ module PactBroker
           let(:head_consumer_tags) { %w[dev prod feat-x feat-y] }
           its(:inclusion_reason) { is_expected.to include "'dev', 'prod', 'feat-x' and 'feat-y'" }
         end
+
+        context "when the pact is a WIP pact" do
+          let(:wip) { true }
+          let(:pending) { true }
+          let(:head_consumer_tags) { %w[feat-x] }
+          let(:pending_provider_tags) { %w[dev] }
+
+          its(:inclusion_reason) { is_expected.to include "This pact is being verified because it is a 'work in progress' pact (ie. it is the pact for the latest version of Foo tagged with 'feat-x' and is still in pending state)."}
+        end
       end
 
       describe "#pending_reason" do

data/spec/lib/pact_broker/ui/controllers/index_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
-require 'pact_broker/ui/controllers/index'
-
 require 'rack/test'
+require 'pact_broker/ui/controllers/index'
+require 'pact_broker/index/service'
 
 module PactBroker
   module UI
@@ -31,13 +30,36 @@ module PactBroker
               expect(last_response.status).to eq(200)
             end
 
+            context "when pagination parameters are present" do
+              it "passes through pagination parameters to the search" do
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(hash_including(page_number: 2, page_size: 40))
+                get "/", { page: '2', pageSize: '40' }
+              end
+            end
+
+            context "when pagination parameters are not present" do
+              context "when tags=true" do
+                it "passes through default pagination parameters to the search with page_size=30" do
+                  expect(PactBroker::Index::Service).to receive(:find_index_items).with(hash_including(page_number: 1, page_size: 30))
+                  get "/", { tags: 'true' }
+                end
+              end
+
+              context "when not tags=true" do
+                it "passes through default pagination parameters to the search with page_size=100" do
+                  expect(PactBroker::Index::Service).to receive(:find_index_items).with(hash_including(page_number: 1, page_size: 100))
+                  get "/"
+                end
+              end
+            end
+
             context "with tags=true" do
               before do
                 allow(PactBroker::Index::Service).to receive(:find_index_items).and_return([])
               end
 
               it "passes tags: true to the IndexService" do
-                expect(PactBroker::Index::Service).to receive(:find_index_items).with(tags: true)
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(hash_including(tags: true))
                 get "/", { tags: 'true' }
               end
             end
@@ -48,7 +70,7 @@ module PactBroker
               end
 
               it "passes tags: ['prod'] to the IndexService" do
-                expect(PactBroker::Index::Service).to receive(:find_index_items).with(tags: ["prod"])
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(hash_including(tags: ["prod"]))
                 get "/", { tags: ["prod"] }
               end
             end
@@ -59,7 +81,7 @@ module PactBroker
               end
 
               it "passes tags: ['prod'] to the IndexService" do
-                expect(PactBroker::Index::Service).to receive(:find_index_items).with(tags: ["prod"])
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(hash_including(tags: ["prod"]))
                 get "/", { tags: "prod" }
               end
             end

data/spec/lib/pact_broker/ui/view_models/index_items_spec.rb

@@ -1,17 +1,20 @@
 require 'spec_helper'
 require 'pact_broker/ui/view_models/index_items'
+require 'pact_broker/index/page'
 
 module PactBroker
   module UI
     module ViewDomain
       describe IndexItems do
 
-        let(:relationship_model_4) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "X") }
-        let(:relationship_model_2) { double("PactBroker::Domain::IndexItem", consumer_name: "a", provider_name: "y") }
-        let(:relationship_model_3) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "Z") }
-        let(:relationship_model_1) { double("PactBroker::Domain::IndexItem", consumer_name: "C", provider_name: "A") }
+        let(:relationship_model_4) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "X", consumer_version_order: 1) }
+        let(:relationship_model_2) { double("PactBroker::Domain::IndexItem", consumer_name: "a", provider_name: "y", consumer_version_order: 2) }
+        let(:relationship_model_3) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "Z", consumer_version_order: 3) }
+        let(:relationship_model_1) { double("PactBroker::Domain::IndexItem", consumer_name: "C", provider_name: "A", consumer_version_order: 4) }
 
-        subject { IndexItems.new([relationship_model_1, relationship_model_3, relationship_model_4, relationship_model_2]) }
+        let(:page) { PactBroker::Index::Page.new([relationship_model_1, relationship_model_3, relationship_model_4, relationship_model_2], 100) }
+
+        subject { IndexItems.new(page) }
 
         describe "#each" do
 
@@ -26,30 +29,6 @@ module PactBroker
 
           end
         end
-
-        describe "size_label" do
-          context "when there is 1 relationship" do
-            subject { IndexItems.new([relationship_model_1]) }
-
-            it "returns '1 pact'" do
-              expect(subject.size_label).to eq "1 pact"
-            end
-          end
-          context "when there are 0 relationships" do
-            subject { IndexItems.new([]) }
-
-            it "returns '0 pacts'" do
-              expect(subject.size_label).to eq "0 pacts"
-            end
-          end
-          context "when there is more than 1 relationship" do
-            subject { IndexItems.new([relationship_model_1, relationship_model_1]) }
-
-            it "returns 'x pacts'" do
-              expect(subject.size_label).to eq "2 pacts"
-            end
-          end
-        end
       end
     end
   end

data/spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb

@@ -0,0 +1,41 @@
+require "pact_broker/matrix/quick_row"
+require "pact_broker/ui/view_models/matrix_line"
+
+module PactBroker
+  module UI
+    module ViewDomain
+      describe MatrixLine do
+        let(:line) { instance_spy(PactBroker::Matrix::QuickRow) }
+
+        subject(:matrix_line) { described_class.new(line) }
+
+        describe "#provide_version_order" do
+          subject(:provider_version_order) { matrix_line.provider_version_order }
+
+          context "verification execution time exists" do
+            let(:verification_executed_at) { Time.now }
+
+            before do
+              allow(line).to receive(:verification_executed_at)
+                .and_return(verification_executed_at)
+            end
+
+            it "returns verification execution timestamp" do
+              timestamp = verification_executed_at.to_i
+
+              expect(provider_version_order).to eq(timestamp)
+            end
+          end
+
+          context "verification execution time does not exist" do
+            before do
+              allow(line).to receive(:verification_executed_at).and_return(nil)
+            end
+
+            it { is_expected.to eq(0) }
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.40.0
+  version: 2.41.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -610,8 +610,12 @@ files:
 - db/ddl_statements.rb
 - db/ddl_statements/head_matrix_v001.rb
 - db/ddl_statements/head_matrix_v002.rb
+- db/ddl_statements/head_pact_tags.rb
+- 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_verification_ids_for_consumer_version_tags.rb
-- db/ddl_statements/latest_verification_ids_for_pact_versions_v001.rb
+- db/ddl_statements/latest_verification_ids_for_pact_versions.rb
 - db/migrations/000001_create_pacticipant_table.rb
 - db/migrations/000002_create_versions_table.rb
 - db/migrations/000003_create_pacts_table.rb
@@ -719,6 +723,10 @@ files:
 - db/migrations/20190910_add_test_results_to_latest_verifications.rb
 - db/migrations/20190911_add_test_results_to_latest_verifications_for_pact_versions.rb
 - db/migrations/20191025_optimise_latest_verification_ids_for_cv_tags.rb
+- db/migrations/20191028_optimise_latest_tagged_pact_cv_orders.rb
+- db/migrations/20191030_optimise_latest_pact_publications_by_consumer_versions_.rb
+- db/migrations/20191031_optimise_latest_verification_ids_for_consumer_version_tags.rb
+- db/migrations/20191101_create_head_pact_tags.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -774,10 +782,13 @@ files:
 - lib/pact_broker.rb
 - lib/pact_broker/api.rb
 - lib/pact_broker/api/contracts/base_contract.rb
+- lib/pact_broker/api/contracts/dry_validation_predicates.rb
+- lib/pact_broker/api/contracts/dry_validation_workarounds.rb
 - lib/pact_broker/api/contracts/pacticipant_name_contract.rb
 - lib/pact_broker/api/contracts/pacticipant_name_validation.rb
 - 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
@@ -969,6 +980,7 @@ files:
 - lib/pact_broker/feature_toggle.rb
 - lib/pact_broker/groups/service.rb
 - lib/pact_broker/hash_refinements.rb
+- lib/pact_broker/index/page.rb
 - lib/pact_broker/index/service.rb
 - lib/pact_broker/integrations/integration.rb
 - lib/pact_broker/integrations/service.rb
@@ -1028,6 +1040,7 @@ files:
 - lib/pact_broker/repositories/helpers.rb
 - lib/pact_broker/services.rb
 - lib/pact_broker/string_refinements.rb
+- lib/pact_broker/tags/head_pact_tags.rb
 - lib/pact_broker/tags/repository.rb
 - lib/pact_broker/tags/service.rb
 - lib/pact_broker/tags/tag_with_latest_flag.rb
@@ -1056,6 +1069,7 @@ files:
 - lib/pact_broker/ui/views/index/_css_and_js.haml
 - lib/pact_broker/ui/views/index/_getting-started.haml
 - lib/pact_broker/ui/views/index/_navbar.haml
+- lib/pact_broker/ui/views/index/_pagination.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
@@ -1155,6 +1169,7 @@ files:
 - public/javascripts/material-menu.js
 - public/javascripts/matrix.js
 - public/javascripts/pact.js
+- public/javascripts/pagination.js
 - public/js/bootstrap.js
 - public/js/bootstrap.min.js
 - public/js/npm.js
@@ -1249,6 +1264,7 @@ files:
 - spec/features/update_matrix_spec.rb
 - spec/features/update_pacticipant_spec.rb
 - spec/features/update_webhook_spec.rb
+- spec/features/wip_pacts_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
 - spec/fixtures/a_consumer-a_provider-conflict.json
@@ -1280,6 +1296,7 @@ files:
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
 - 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
@@ -1423,6 +1440,7 @@ files:
 - spec/lib/pact_broker/ui/controllers/index_spec.rb
 - spec/lib/pact_broker/ui/view_models/index_item_spec.rb
 - spec/lib/pact_broker/ui/view_models/index_items_spec.rb
+- spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb
 - spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/sequence_spec.rb
@@ -1618,6 +1636,7 @@ test_files:
 - spec/features/update_matrix_spec.rb
 - spec/features/update_pacticipant_spec.rb
 - spec/features/update_webhook_spec.rb
+- spec/features/wip_pacts_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
 - spec/fixtures/a_consumer-a_provider-conflict.json
@@ -1649,6 +1668,7 @@ test_files:
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
 - 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
@@ -1792,6 +1812,7 @@ test_files:
 - spec/lib/pact_broker/ui/controllers/index_spec.rb
 - spec/lib/pact_broker/ui/view_models/index_item_spec.rb
 - spec/lib/pact_broker/ui/view_models/index_items_spec.rb
+- spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb
 - spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/sequence_spec.rb