pact_broker 2.8.0.beta.4 → 2.8.0.beta.5

data/spec/lib/pact_broker/matrix/row_spec.rb

@@ -0,0 +1,51 @@
+require 'pact_broker/matrix/row'
+
+module PactBroker
+  module Matrix
+    describe Row do
+      describe "<=>" do
+        let(:row_1) do
+          Row.new(
+            consumer_name: 'A',
+            consumer_version_order: 1,
+            pact_revision_number: 1,
+            provider_name: 'B',
+            provider_version_order: 1,
+            verification_id: 1
+          )
+        end
+        let(:row_2) do
+          Row.new(
+            consumer_name: 'A',
+            consumer_version_order: 1,
+            pact_revision_number: 1,
+            provider_name: 'B',
+            provider_version_order: 1,
+            verification_id: 2
+          )
+        end
+
+        it "sorts" do
+          expect([row_1, row_2].sort).to eq [row_2, row_1]
+        end
+
+        context "with a nil column" do
+          let(:row_2) do
+            Row.new(
+              consumer_name: 'A',
+              consumer_version_order: 1,
+              pact_revision_number: 1,
+              provider_name: 'B',
+              provider_version_order: nil,
+              verification_id: nil
+            )
+          end
+
+          it "sorts the rows first" do
+            expect([row_1, row_2].sort).to eq [row_2, row_1]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/migrations/50_create_latest_matrix_spec.rb

@@ -0,0 +1,113 @@
+describe 'create latest matrix (latest pact revision/latest verification for provider version)', migration: true do
+  before do
+    PactBroker::Database.migrate(50)
+  end
+
+  def shorten_row row
+    "#{row[:consumer_name]}#{row[:consumer_version_number]} #{row[:provider_name]}#{row[:provider_version_number] || '?'} (r#{row[:pact_revision_number]}/n#{row[:verification_number] || '?'})"
+  end
+
+  let(:now) { DateTime.new(2018, 2, 2) }
+  let!(:consumer) { create(:pacticipants, {name: 'C', created_at: now, updated_at: now}) }
+  let!(:provider) { create(:pacticipants, {name: 'P', created_at: now, updated_at: now}) }
+  let!(:consumer_version_1) { create(:versions, {number: '1', order: 1, pacticipant_id: consumer[:id], created_at: now, updated_at: now}) }
+  let!(:consumer_version_2) { create(:versions, {number: '2', order: 2, pacticipant_id: consumer[:id], created_at: now, updated_at: now}) }
+  let!(:provider_version_1) { create(:versions, {number: '1', order: 1, pacticipant_id: provider[:id], created_at: now, updated_at: now}) }
+  let!(:provider_version_2) { create(:versions, {number: '2', order: 2, pacticipant_id: provider[:id], created_at: now, updated_at: now}) }
+  let!(:pact_version_1) { create(:pact_versions, {content: {some: 'json'}.to_json, sha: '1', consumer_id: consumer[:id], provider_id: provider[:id], created_at: now}) }
+  let!(:pact_version_2) { create(:pact_versions, {content: {some: 'json other'}.to_json, sha: '2', consumer_id: consumer[:id], provider_id: provider[:id], created_at: now}) }
+  let!(:pact_version_3) { create(:pact_versions, {content: {some: 'json more'}.to_json, sha: '3', consumer_id: consumer[:id], provider_id: provider[:id], created_at: now}) }
+  let!(:pact_publication_1) do
+    create(:pact_publications, {
+      consumer_version_id: consumer_version_1[:id],
+      provider_id: provider[:id],
+      revision_number: 1,
+      pact_version_id: pact_version_1[:id],
+      created_at: now
+    })
+  end
+
+  let!(:pact_publication_2) do
+    create(:pact_publications, {
+      consumer_version_id: consumer_version_1[:id],
+      provider_id: provider[:id],
+      revision_number: 2,
+      pact_version_id: pact_version_2[:id],
+      created_at: now
+    })
+  end
+
+  # C2 P? (r1/n?)
+  let!(:pact_publication_3) do
+    create(:pact_publications, {
+      consumer_version_id: consumer_version_2[:id],
+      provider_id: provider[:id],
+      revision_number: 1,
+      pact_version_id: pact_version_3[:id],
+      created_at: now
+    })
+  end
+
+  # C1 P3 (r1n3)
+  let!(:verification_1) do
+    create(:verifications, {
+      number: 1,
+      success: true,
+      provider_version_id: provider_version_1[:id],
+      pact_version_id: pact_version_1[:id],
+      execution_date: now,
+      created_at: now
+    })
+  end
+
+  # C1 P3 (r1n1)
+  let!(:verification_2) do
+    create(:verifications, {
+      number: 1,
+      success: true,
+      provider_version_id: provider_version_1[:id],
+      pact_version_id: pact_version_2[:id],
+      execution_date: now,
+      created_at: now
+    })
+  end
+
+  # include
+  let!(:verification_3) do
+    create(:verifications, {
+      number: 2,
+      success: true,
+      provider_version_id: provider_version_1[:id],
+      pact_version_id: pact_version_2[:id],
+      execution_date: now,
+      created_at: now
+    })
+  end
+
+  # include
+  let!(:verification_4) do
+    create(:verifications, {
+      number: 3,
+      success: true,
+      provider_version_id: provider_version_2[:id],
+      pact_version_id: pact_version_2[:id],
+      execution_date: now,
+      created_at: now
+    })
+  end
+
+  # C1 P1 (r1/n1) this pact version is overwritten by r2
+  # C1 P1 (r2/n1) this verification is overwritten by n2
+  # C1 P1 (r2/n2)
+  # C1 P2 (r2/n3)
+  # C2 P? (r1/n?)
+
+  it "only includes the latest pact revisions and latest verifications" do
+    rows = database[:latest_matrix].order(:verification_id).all.collect{|row| shorten_row(row) }
+    expect(rows).to include "C1 P1 (r2/n2)"
+    expect(rows).to include "C1 P2 (r2/n3)"
+    expect(rows).to include "C2 P? (r1/n?)"
+    expect(rows).to_not include "C1 P1 (r2/n1)"
+    expect(database[:latest_matrix].count).to eq 3
+  end
+end

data/spec/migrations/change_migration_strategy_spec.rb

@@ -58,7 +58,7 @@ describe "changing from integer to timestamp migrations", no_db_clean: true do
       puts output
       output = `bundle exec rake pact_broker:db:version`
       puts output
-      expect(output.strip).to eq "47"
+      expect(output.strip.to_i).to be > 47
     end
   end
 

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -6,10 +6,12 @@ Pact.provider_states_for "Pact Broker Client" do
     set_up do
       TestDataBuilder.new
         .create_pact_with_hierarchy("Foo Thing", "1.2.3", "Bar")
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
         .create_verification(provider_version: "7.8.9", number: 2)
         .create_consumer_version("2.0.0")
         .create_pact
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
     end
   end
@@ -18,10 +20,12 @@ Pact.provider_states_for "Pact Broker Client" do
     set_up do
       TestDataBuilder.new
         .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
         .create_verification(provider_version: "7.8.9", number: 2)
         .create_consumer_version("2.0.0")
         .create_pact
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
     end
   end
@@ -30,9 +34,11 @@ Pact.provider_states_for "Pact Broker Client" do
     set_up do
       TestDataBuilder.new
         .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
         .create_consumer_version("1.2.4")
         .create_pact
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
     end
   end
@@ -41,26 +47,40 @@ Pact.provider_states_for "Pact Broker Client" do
     set_up do
       TestDataBuilder.new
         .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .revise_pact
         .create_verification(provider_version: "4.5.6")
         .create_consumer_version("1.2.4")
         .create_pact
+        .revise_pact
         .create_verification(provider_version: "9.9.9", success: false)
     end
   end
 
   provider_state "the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6 with tag prod, and 1.2.4 unsuccessfully by 9.9.9" do
-      set_up do
-        TestDataBuilder.new
-          .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
-          .create_verification(provider_version: "4.5.6")
-          .use_provider("Bar")
-          .use_provider_version("4.5.6")
-          .create_provider_version_tag("prod")
-          .create_consumer_version("1.2.4")
-          .create_pact
-          .create_verification(provider_version: "9.9.9", success: false)
-      end
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .revise_pact
+        .create_verification(provider_version: "4.5.6")
+        .use_provider("Bar")
+        .use_provider_version("4.5.6")
+        .create_provider_version_tag("prod")
+        .create_consumer_version("1.2.4")
+        .create_pact
+        .revise_pact
+        .create_verification(provider_version: "9.9.9", success: false)
     end
+  end
+
+  provider_state "the pact for Foo version 1.2.3 has been verified by Bar version 4.5.6 and version 5.6.7" do
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .revise_pact
+        .create_verification(provider_version: "4.5.6")
+        .create_verification(provider_version: "5.6.7", number: 2)
+    end
+  end
 
   provider_state "the 'Pricing Service' does not exist in the pact-broker" do
     no_op

data/spec/support/shared_examples_for_responses.rb

@@ -42,11 +42,30 @@ RSpec::Matchers.define :be_a_404_response do
   end
 end
 
+RSpec::Matchers.define :include_hashes_matching do |expected_array_of_hashes|
+  match do |array_of_hashes|
+    expected_array_of_hashes.each do | expected |
+      expect(array_of_hashes).to include_hash_matching(expected)
+    end
+
+    expect(array_of_hashes.size).to eq expected_array_of_hashes.size
+  end
+
+  def slice actual, keys
+    keys.each_with_object({}) { |k, hash| hash[k] = actual[k] if actual.has_key?(k) }
+  end
+end
+
 RSpec::Matchers.define :include_hash_matching do |expected|
   match do |array_of_hashes|
+    @array_of_hashes = array_of_hashes
     array_of_hashes.any? { |actual| slice(actual, expected.keys) == expected }
   end
 
+  failure_message do
+    "expected #{@array_of_hashes.inspect} to include #{expected.inspect}"
+  end
+
   def slice actual, keys
     keys.each_with_object({}) { |k, hash| hash[k] = actual[k] if actual.has_key?(k) }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.8.0.beta.4
+  version: 2.8.0.beta.5
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -524,6 +524,9 @@ files:
 - db/migrations/000045_set_verification_provider_number_nullable.rb
 - db/migrations/000046_recreate_latest_verifications.rb
 - db/migrations/000047_create_all_verifications.rb
+- db/migrations/000048_create_matrix.rb
+- db/migrations/000049_create_latest_verifications_for_cv_and_pv.rb
+- db/migrations/000050_create_latest_matrix.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
@@ -696,8 +699,10 @@ files:
 - lib/pact_broker/labels/service.rb
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
+- lib/pact_broker/matrix/latest_row.rb
 - lib/pact_broker/matrix/parse_query.rb
 - lib/pact_broker/matrix/repository.rb
+- lib/pact_broker/matrix/row.rb
 - lib/pact_broker/matrix/service.rb
 - lib/pact_broker/messages.rb
 - lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb
@@ -926,6 +931,7 @@ files:
 - spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_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
 - spec/lib/pact_broker/messages_spec.rb
 - spec/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names_spec.rb
@@ -969,6 +975,7 @@ files:
 - spec/migrations/41_migrate_execution_data_spec.rb
 - spec/migrations/42_delete_ophan_webhook_data_spec.rb
 - spec/migrations/44_add_provider_version_to_verification_spec.rb
+- spec/migrations/50_create_latest_matrix_spec.rb
 - spec/migrations/change_migration_strategy_spec.rb
 - spec/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
@@ -1160,6 +1167,7 @@ test_files:
 - spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_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
 - spec/lib/pact_broker/messages_spec.rb
 - spec/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names_spec.rb
@@ -1203,6 +1211,7 @@ test_files:
 - spec/migrations/41_migrate_execution_data_spec.rb
 - spec/migrations/42_delete_ophan_webhook_data_spec.rb
 - spec/migrations/44_add_provider_version_to_verification_spec.rb
+- spec/migrations/50_create_latest_matrix_spec.rb
 - spec/migrations/change_migration_strategy_spec.rb
 - spec/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb