pact_broker 2.19.1 → 2.19.2

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

@@ -5,7 +5,6 @@ require 'pact_broker/pacts/repository'
 module PactBroker
   module Pacts
     describe CreateFormattedDiff do
-
       describe ".call" do
 
         let(:pact_content_version_1) do
@@ -24,9 +23,7 @@ module PactBroker
           expect(subject).to match /\+.*get/
           expect(subject).to_not include 'Key'
         end
-
       end
-
     end
   end
 end

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

@@ -0,0 +1,92 @@
+require 'pact_broker/pacts/generate_sha'
+
+module PactBroker
+  module Pacts
+    describe GenerateSha do
+      describe ".call integration test" do
+        let(:json_content) do
+          {
+            interactions: [{a: 1, b: 2}, {c: 3, d: 4}],
+            metadata: {
+              pactSpecification: {
+                version: '1'
+              }
+            }
+          }.to_json
+        end
+
+        let(:json_content_with_only_order_difference) do
+          {
+            interactions: [{d: 4, c: 3}, {b: 2, a: 1}],
+            metadata: {
+              :'pact-specification' => {
+                version: '1'
+              }
+            }
+          }.to_json
+        end
+
+        let(:json_content_with_diff_interactions) do
+          {
+            interactions: [{a: 9999, b: 2}, {c: 3, d: 4}],
+            metadata: {
+              pactSpecification: {
+                version: '1'
+              }
+            }
+          }.to_json
+        end
+
+        before do
+          allow(Content).to receive(:from_json).and_return(content)
+          allow(content).to receive(:sort).and_return(content)
+        end
+
+        let(:content) { instance_double('PactBroker::Pacts::Content', content_that_affects_verification_results: content_that_affects_verification_results) }
+        let(:content_that_affects_verification_results) { double('content', to_json: 'foo') }
+
+        subject { GenerateSha.call(json_content) }
+
+        it "accepts options in case there is any future requirement for a second argument" do
+          expect{ GenerateSha.call(json_content, some: 'options') }.to_not raise_error
+        end
+
+        context "when equality is based on the verifiable content only" do
+          before do
+            PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = true
+          end
+
+          it "sorts the content" do
+            expect(content).to receive(:sort)
+            subject
+          end
+
+          it "creates the sha from the sorted content JSON" do
+            expect(Digest::SHA1).to receive(:hexdigest).with(content_that_affects_verification_results.to_json)
+            subject
+          end
+
+          it "returns the sha" do
+            expect(subject).to eq "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33"
+          end
+        end
+
+        context "when equality is based on the verifiable content only" do
+          it "does not sort the content" do
+            expect(Content).to_not receive(:from_json)
+            subject
+          end
+
+          it "creates the sha from the original JSON" do
+            expect(Digest::SHA1).to receive(:hexdigest).with(json_content)
+            subject
+          end
+
+          it "returns the sha" do
+            expect(subject).to eq "ebc0feee91fb7fc0acf8420426184478ebaf648a"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -38,7 +38,11 @@ module PactBroker
           expect(subject.created_at).to be_datey
         end
 
-        context "when a pact already exists with the same content" do
+        context "when a pact already exists with exactly the same content" do
+          before do
+            PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = false
+          end
+
           let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
 
           before do
@@ -49,8 +53,47 @@ module PactBroker
             Repository.new.create version_id: another_version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
           end
 
+          it "does not the content" do
+            expect_any_instance_of(Content).to_not receive(:sort)
+            subject
+          end
+
+          it "creates a new PactPublication" do
+            expect { subject }.to change{ PactPublication.count }.by(1)
+          end
+
           it "reuses the same PactVersion to save room" do
-            expect { subject }.to change{ PactVersion.count }.by(0)
+            expect { subject }.to_not change{ PactVersion.count }
+          end
+        end
+
+        context "when base_equality_only_on_content_that_affects_verification_results is true" do
+          let(:another_version) { Versions::Repository.new.create number: '2.0.0', pacticipant_id: consumer.id }
+          let(:sha_1) { '1' }
+          let(:sha_2) { '1' }
+
+          before do
+            PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = true
+            allow(PactBroker.configuration.sha_generator).to receive(:call).and_return(sha_1, sha_2)
+            Repository.new.create version_id: version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
+          end
+
+          subject do
+            Repository.new.create version_id: another_version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
+          end
+
+          context "when the sha is the same" do
+            it "reuses the same PactVersion to save room" do
+              expect { subject }.to_not change{ PactVersion.count }
+            end
+          end
+
+          context "when the sha is not the same" do
+            let(:sha_2) { '2' }
+
+            it "creates a new PactVersion" do
+              expect { subject }.to change{ PactVersion.count }.by(1)
+            end
           end
         end
 
@@ -65,7 +108,7 @@ module PactBroker
             Repository.new.create version_id: another_version.id, consumer_id: consumer.id, provider_id: provider.id, json_content: json_content
           end
 
-          it "does not reuse the same PactVersion to save room" do
+          it "does not reuse the same PactVersion" do
             expect { subject }.to change{ PactVersion.count }.by(1)
           end
         end
@@ -524,7 +567,7 @@ module PactBroker
         let(:pact_content_version_1) { load_fixture('consumer-provider.json') }
         let(:pact_content_version_2) do
           hash = load_json_fixture('consumer-provider.json')
-          hash['foo'] = 'bar' # Extra key will affect equality
+          hash['interactions'].first['foo'] = 'bar' # Extra key in interactions will affect equality
           hash.to_json
         end
         let(:pact_content_version_3) {  load_fixture('consumer-provider.json') }

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

@@ -0,0 +1,44 @@
+require 'pact_broker/pacts/sort_content'
+
+module PactBroker
+  module Pacts
+    describe SortContent do
+      let(:pact_content_1) do
+        {
+          'a' => 1,
+          'interactions' => [{ 'a' => 1, 'b' => 2 }, { 'a' => [2, 1, 3], 'b' => 3 }]
+        }
+      end
+
+      let(:pact_content_2) do
+        {
+          'interactions' => [{ 'b' => 3, 'a' => [2, 1, 3]}, { 'b' => 2, 'a' => 1 }],
+          'a' => 1
+        }
+      end
+
+      let(:expected_sorted_content) do
+        '{"a":1,"interactions":[{"a":1,"b":2},{"a":[2,1,3],"b":3}]}'
+      end
+
+      it "sorts the interactions/messages and keys in a deterministic way" do
+        expect(SortContent.call(pact_content_1).to_json).to eq(expected_sorted_content)
+        expect(SortContent.call(pact_content_2).to_json).to eq(expected_sorted_content)
+      end
+
+      context "when there is no messages or interactions key" do
+        let(:other_content) do
+          {
+            'z' => 1,
+            'a' => 1,
+            'b' => 1,
+          }
+        end
+
+        it "does not change the content" do
+          expect(SortContent.call(other_content)).to eq other_content
+        end
+      end
+    end
+  end
+end

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

@@ -34,17 +34,25 @@ module PactBroker
 
       describe "#create" do
         context "when a previous version exists" do
-
-          let!(:existing_order) do
-            TestDataBuilder.new.create_version_with_hierarchy pacticipant_name, version_number
+          let!(:existing_version) do
+            TestDataBuilder.new.create_version_with_hierarchy(pacticipant_name, version_number).and_return(:version)
           end
 
-          subject { Repository.new.create pacticipant_id: existing_order.pacticipant_id, number: "1.2.4" }
+          subject { Repository.new.create pacticipant_id: existing_version.pacticipant_id, number: "1.2.4" }
 
           it "sets the order to the previous version's order plus one" do
-            expect(subject.order).to eq existing_order.order + 1
+            expect(subject.order).to eq existing_version.order + 1
           end
+        end
+
+        context "when the same version already exists" do
+          let!(:existing_version) { TestDataBuilder.new.create_version_with_hierarchy(pacticipant_name, version_number).and_return(:version) }
 
+          subject { Repository.new.create pacticipant_id: existing_version.pacticipant_id, number: version_number }
+
+          it "returns the pre-existing version" do
+            expect(subject.id).to eq existing_version.id
+          end
         end
       end
 

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ I18n.config.enforce_available_locales = false
 RSpec.configure do | config |
   config.before :each do
     PactBroker.reset_configuration
+    PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = false
     require 'pact_broker/badges/service'
     PactBroker::Badges::Service.clear_cache
   end

data/spec/support/foo-bar.json

@@ -0,0 +1,34 @@
+{
+  "consumer": {
+    "name": "Foo"
+  },
+  "provider": {
+    "name": "Bar"
+  },
+  "interactions": [
+    {
+      "description": "a retrieve thing request",
+      "request": {
+        "method": "get",
+        "path": "/thing"
+      },
+      "response": {
+        "status": 200
+      }
+    },{
+      "description": "another retrieve thing request",
+      "request": {
+        "method": "get",
+        "path": "/another-thing"
+      },
+      "response": {
+        "status": 200
+      }
+    }
+  ],
+  "metadata": {
+    "pactSpecification": {
+      "version": "2.0.0"
+    }
+  }
+}

data/spec/support/rspec_match_hash.rb

@@ -4,26 +4,23 @@ RSpec::Matchers.define :contain_hash do |expected|
   match do |actual|
     contains_hash?(expected, actual)
   end
-end
 
+  failure_message do |actual|
+    "expected #{actual.class} to include #{expected.class}\n" + formatted_diffs
+  end
 
-def contains_hash?(expected, actual)
-  if actual.is_a?(Array)
-    actual.any? && actual.any?{|actual_item| contains_hash?(expected, actual_item)}
-  else
-    expected.all? do |key, value|
-      unordered_match(actual[key], value)
-    end
+  def formatted_diffs
+    @diffs.collect{ | diff| Pact::Matchers::UnixDiffFormatter.call(diff) }.join("\n")
   end
-end
 
-def unordered_match(expected, actual)
-  case
-  when [expected, actual].all?{|val| val.is_a? Array }
-    expected.all?{|el| actual.include? el }
-  when [expected, actual].all?{|val| val.is_a? Hash }
-    contains_hash?(expected, actual)
-  else
-    expected == actual
+  def contains_hash?(expected, actual)
+    if actual.is_a?(Array)
+      actual.any? && actual.any?{|actual_item| contains_hash?(expected, actual_item)}
+    else
+      @diffs ||= []
+      diff = Pact::Matchers.diff(expected, actual.to_hash)
+      @diffs << diff
+      diff.empty?
+    end
   end
 end

data/spec/support/test_data_builder.rb

@@ -121,12 +121,14 @@ class TestDataBuilder
   def create_version_with_hierarchy pacticipant_name, pacticipant_version
     pacticipant = PactBroker::Domain::Pacticipant.create(:name => pacticipant_name)
     version = PactBroker::Domain::Version.create(:number => pacticipant_version, :pacticipant => pacticipant)
-    PactBroker::Domain::Version.find(id: version.id) # Get version with populated order
+    @version = PactBroker::Domain::Version.find(id: version.id) # Get version with populated order
+    self
   end
 
   def create_tag_with_hierarchy pacticipant_name, pacticipant_version, tag_name
-    version = create_version_with_hierarchy pacticipant_name, pacticipant_version
-    PactBroker::Domain::Tag.create(name: tag_name, version: version)
+    create_version_with_hierarchy pacticipant_name, pacticipant_version
+    PactBroker::Domain::Tag.create(name: tag_name, version: @version)
+    self
   end
 
   def create_pacticipant pacticipant_name, params = {}
@@ -340,5 +342,4 @@ class TestDataBuilder
        "random" => rand
      }.to_json
    end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.19.2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -615,6 +615,8 @@ files:
 - db/migrations/20180311_optimise_head_matrix.rb
 - db/migrations/20180315_create_verification_sequence.rb
 - db/migrations/20180330_refresh_matrix.rb
+- db/migrations/20180523_create_latest_verifications_for_consumer_version_tags.rb
+- db/migrations/20180524_create_latest_verifications_for_consumer_and_provider.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
@@ -812,8 +814,8 @@ files:
 - lib/pact_broker/labels/service.rb
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
+- lib/pact_broker/matrix/aggregated_row.rb
 - lib/pact_broker/matrix/head_row.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
@@ -823,8 +825,10 @@ files:
 - lib/pact_broker/pacticipants/repository.rb
 - lib/pact_broker/pacticipants/service.rb
 - lib/pact_broker/pacts/all_pact_publications.rb
+- lib/pact_broker/pacts/content.rb
 - lib/pact_broker/pacts/create_formatted_diff.rb
 - lib/pact_broker/pacts/diff.rb
+- lib/pact_broker/pacts/generate_sha.rb
 - 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
@@ -832,9 +836,10 @@ files:
 - lib/pact_broker/pacts/pact_params.rb
 - lib/pact_broker/pacts/pact_publication.rb
 - lib/pact_broker/pacts/pact_version.rb
+- lib/pact_broker/pacts/parse.rb
 - lib/pact_broker/pacts/repository.rb
 - lib/pact_broker/pacts/service.rb
-- lib/pact_broker/pacts/sort_verifiable_content.rb
+- lib/pact_broker/pacts/sort_content.rb
 - lib/pact_broker/project_root.rb
 - lib/pact_broker/relationships/groupify.rb
 - lib/pact_broker/repositories.rb
@@ -869,6 +874,8 @@ files:
 - lib/pact_broker/ui/views/layouts/main.haml
 - lib/pact_broker/ui/views/matrix/show.haml
 - lib/pact_broker/verifications/all_verifications.rb
+- lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb
+- lib/pact_broker/verifications/latest_verification_for_consumer_version_tag.rb
 - lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb
 - lib/pact_broker/verifications/repository.rb
 - lib/pact_broker/verifications/sequence.rb
@@ -954,11 +961,13 @@ files:
 - script/recreate-pg-db.sh
 - script/recreate-test-database.sh
 - script/release.sh
+- script/run-with-ssl.rb
 - script/seed-example-matrix.rb
 - script/seed-matrix.rb
 - script/seed.rb
 - script/update-hal-browser
 - script/webhook-server.ru
+- spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/create_pacticipant_spec.rb
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_label_spec.rb
@@ -1087,7 +1096,7 @@ files:
 - spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
 - spec/lib/pact_broker/domain/group_spec.rb
-- spec/lib/pact_broker/domain/index_items_spec.rb
+- spec/lib/pact_broker/domain/index_item_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
@@ -1098,6 +1107,7 @@ files:
 - spec/lib/pact_broker/index/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
 - spec/lib/pact_broker/labels/service_spec.rb
+- spec/lib/pact_broker/matrix/aggregated_row_spec.rb
 - spec/lib/pact_broker/matrix/head_row_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
@@ -1107,15 +1117,17 @@ files:
 - spec/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names_spec.rb
 - spec/lib/pact_broker/pacticipants/repository_spec.rb
 - spec/lib/pact_broker/pacticipants/service_spec.rb
+- spec/lib/pact_broker/pacts/content_spec.rb
 - spec/lib/pact_broker/pacts/create_formatted_diff_spec.rb
 - spec/lib/pact_broker/pacts/diff_spec.rb
+- spec/lib/pact_broker/pacts/generate_sha_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_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_spec.rb
 - spec/lib/pact_broker/pacts/service_spec.rb
-- spec/lib/pact_broker/pacts/sort_verifiable_content_spec.rb
+- spec/lib/pact_broker/pacts/sort_content_spec.rb
 - spec/lib/pact_broker/relationships/groupify_spec.rb
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
@@ -1159,6 +1171,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
+- spec/support/foo-bar.json
 - spec/support/generated_index.md
 - spec/support/generated_markdown.md
 - spec/support/interaction_view_model.json
@@ -1243,6 +1256,7 @@ signing_key:
 specification_version: 4
 summary: See description
 test_files:
+- spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb
 - spec/features/create_pacticipant_spec.rb
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_label_spec.rb
@@ -1371,7 +1385,7 @@ test_files:
 - spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
 - spec/lib/pact_broker/domain/group_spec.rb
-- spec/lib/pact_broker/domain/index_items_spec.rb
+- spec/lib/pact_broker/domain/index_item_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
@@ -1382,6 +1396,7 @@ test_files:
 - spec/lib/pact_broker/index/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
 - spec/lib/pact_broker/labels/service_spec.rb
+- spec/lib/pact_broker/matrix/aggregated_row_spec.rb
 - spec/lib/pact_broker/matrix/head_row_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
@@ -1391,15 +1406,17 @@ test_files:
 - spec/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names_spec.rb
 - spec/lib/pact_broker/pacticipants/repository_spec.rb
 - spec/lib/pact_broker/pacticipants/service_spec.rb
+- spec/lib/pact_broker/pacts/content_spec.rb
 - spec/lib/pact_broker/pacts/create_formatted_diff_spec.rb
 - spec/lib/pact_broker/pacts/diff_spec.rb
+- spec/lib/pact_broker/pacts/generate_sha_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_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_spec.rb
 - spec/lib/pact_broker/pacts/service_spec.rb
-- spec/lib/pact_broker/pacts/sort_verifiable_content_spec.rb
+- spec/lib/pact_broker/pacts/sort_content_spec.rb
 - spec/lib/pact_broker/relationships/groupify_spec.rb
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
@@ -1443,6 +1460,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
+- spec/support/foo-bar.json
 - spec/support/generated_index.md
 - spec/support/generated_markdown.md
 - spec/support/interaction_view_model.json