pact_broker 2.18.0 → 2.19.0

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

@@ -102,23 +102,7 @@ module PactBroker
           let(:selectors) { [{ pacticipant_name: "Foo", pacticipant_version_number: "1", latest: true }, { pacticipant_name: "Bar", pacticipant_version_number: "2" }] }
 
           it "returns an error message" do
-            expect(subject).to eq ["A version and latest flag cannot both be specified for Foo"]
-          end
-        end
-
-        context "when a tag is specified without latest=true" do
-          before do
-            td.create_pacticipant("Foo")
-              .create_version("1")
-              .create_tag("prod")
-              .create_pacticipant("Bar")
-              .create_version("2")
-          end
-
-          let(:selectors) { [{ pacticipant_name: "Foo", tag: "1"}] }
-
-          it "returns an error message" do
-            expect(subject).to eq ["Querying for all versions with a tag is not currently supported. The latest=true flag must be specified when a tag is given."]
+            expect(subject).to eq ["A version number and latest flag cannot both be specified for Foo"]
           end
         end
       end

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

@@ -15,6 +15,19 @@ module PactBroker
         end
         let(:pact_content_version_2) { load_fixture('consumer-provider.json') }
         let(:pact_content_version_3) { pact_content_version_2 }
+        let(:pact_content_version_4) do
+          hash = load_json_fixture('consumer-provider.json')
+          hash['interactions'].first['request']['method'] = 'delete'
+          hash.to_json
+        end
+
+        let(:pact_params) do
+          PactBroker::Pacts::PactParams.new(
+            consumer_name: 'Consumer',
+            provider_name: 'Provider',
+            consumer_version_number: '3'
+          )
+        end
 
         before do
           TestDataBuilder.new
@@ -26,21 +39,36 @@ module PactBroker
             .create_pact(json_content: pact_content_version_2)
             .create_consumer_version("3")
             .create_pact(json_content: pact_content_version_3)
+            .create_consumer_version("4")
+            .create_pact(json_content: pact_content_version_4)
+
           allow(DateHelper).to receive(:local_date_in_words).and_return("a date")
         end
 
-        subject { Diff.new.process(pact_params.merge(base_url: 'http://example.org')) }
-
-        context "when there is a previous distinct version" do
+        subject { Diff.new.process(pact_params.merge(base_url: 'http://example.org'), nil, raw: true) }
 
-          let(:pact_params) do
+        context "when a comparison version is specified" do
+          let(:comparison_pact_params) do
             PactBroker::Pacts::PactParams.new(
               consumer_name: 'Consumer',
               provider_name: 'Provider',
-              consumer_version_number: '3'
-            )
+              consumer_version_number: '4'
+            ).merge(base_url: 'http://example.org')
           end
 
+          subject { Diff.new.process(pact_params.merge(base_url: 'http://example.org'), comparison_pact_params) }
+
+          it "compares the two pacts" do
+            expect(subject).to include "Pact between Consumer (v3) and Provider"
+            expect(subject).to include "Pact between Consumer (v4) and Provider"
+          end
+
+          it "includes a link to the comparison pact", pending: true do
+            expect(subject).to include "comparision-pact-version:"
+          end
+        end
+
+        context "when there is a previous distinct version" do
           it "indicates when the previous change was made" do
             expect(subject).to include "The following changes were made less than a minute ago (a date)"
           end
@@ -66,7 +94,6 @@ module PactBroker
           end
         end
       end
-
     end
   end
 end

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

@@ -9,19 +9,44 @@ module PactBroker
       let(:consumer_version_number) { '1.2.3' }
       let(:headers) { { 'X-Pact-Consumer-Version' => consumer_version_number, 'Host' => 'example.org' } }
       let(:revision_number) { '1' }
+      let(:path_info) do
+        {
+          consumer_name: 'Consumer',
+          provider_name: 'Provider',
+          consumer_version_number: '1.2.3',
+          revision_number: revision_number,
+          pact_version_sha: '123'
+        }
+      end
+
+      describe "from_path_info" do
+        subject { PactParams.from_path_info(path_info) }
+
+        it "extracts the consumer name from the path" do
+          expect(subject.consumer_name).to eq "Consumer"
+        end
+
+        it "extracts the provider name from the path" do
+          expect(subject.provider_name).to eq "Provider"
+        end
+
+        it "extracts the consumer_version_number from the path" do
+          expect(subject.consumer_version_number).to eq "1.2.3"
+        end
+
+        it "extracts the revision_number from the path" do
+          expect(subject.revision_number).to eq "1"
+        end
+
+        it "extracts the pact_version_sha from the path" do
+          expect(subject.pact_version_sha).to eq "123"
+        end
+      end
 
       describe "from_request" do
 
         context "from a PUT request" do
           let(:request) { Webmachine::Request.new("PUT", "/", headers, body)}
-          let(:path_info) do
-            {
-              consumer_name: 'Consumer',
-              provider_name: 'Provider',
-              consumer_version_number: '1.2.3',
-              revision_number: revision_number
-            }
-          end
 
           subject { PactParams.from_request(request, path_info) }
 

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

@@ -244,7 +244,6 @@ module PactBroker
       end
 
       describe "#find_latest_pact_versions_for_provider" do
-
         context "with no tag specified" do
           before do
             TestDataBuilder.new
@@ -308,7 +307,72 @@ module PactBroker
             expect(subject.last.consumer_version.number).to eq "5.0.0"
           end
         end
+      end
+
+      describe "#find_pact_versions_for_provider" do
+        context "with no tag specified" do
+          before do
+            TestDataBuilder.new
+              .create_consumer(consumer_name)
+              .create_consumer_version("1.0.0")
+              .create_provider(provider_name)
+              .create_pact
+              .create_consumer_version("1.2.3")
+              .create_pact
+              .create_consumer("wiffle consumer")
+              .create_consumer_version("4.0.0")
+              .create_pact
+              .create_consumer_version("4.5.6")
+              .create_pact
+              .create_provider("not the provider")
+              .create_pact
+          end
+
+          subject { Repository.new.find_pact_versions_for_provider provider_name }
+
+          it "returns all the pact versions for the specified provider" do
+            expect(subject.size).to eq 4
+            expect(subject.first.provider.name).to eq provider_name
+          end
+        end
+
+        context "with a tag specified" do
+          before do
+            TestDataBuilder.new
+              .create_consumer(consumer_name)
+              .create_consumer_version("1")
+              .create_consumer_version_tag("prod")
+              .create_provider(provider_name)
+              .create_pact
+              .create_consumer_version("2")
+              .create_consumer_version_tag("prod")
+              .create_pact
+              .create_consumer_version("3")
+              .create_pact
+              .create_consumer("wiffle consumer")
+              .create_consumer_version("10")
+              .create_pact
+              .create_consumer_version("11")
+              .create_consumer_version_tag("prod")
+              .create_consumer_version_tag("test")
+              .create_pact
+              .create_provider("not the provider")
+              .create_pact
+          end
+
+          subject { Repository.new.find_pact_versions_for_provider provider_name, "prod" }
 
+          it "returns the pacts between the specified consumer and provider with the given tag" do
+            expect(subject.size).to eq 3
+            expect(subject.first.provider.name).to eq provider_name
+            expect(subject.first.consumer.name).to eq consumer_name
+            expect(subject.first.consumer_version.number).to eq "1"
+            expect(subject[1].consumer_version.number).to eq "2"
+            expect(subject.first.json_content).to be nil
+            expect(subject.last.consumer.name).to eq "wiffle consumer"
+            expect(subject.last.consumer_version.number).to eq "11"
+          end
+        end
       end
 
       describe "find_pact" do

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

@@ -0,0 +1,25 @@
+require 'pact_broker/pacts/sort_verifiable_content'
+
+module PactBroker
+  module Pacts
+    describe SortVerifiableContent do
+      let(:pact_content_1) do
+        {
+          a: 1,
+          interactions: [{ a: 1, b: 2 }, { a: 2, b: 3 }]
+        }.to_json
+      end
+
+      let(:pact_content_2) do
+        {
+          interactions: [{ b: 3, a: 2}, { b: 2, a: 1 }],
+          a: 1
+        }.to_json
+      end
+
+      it "sorts the interactions/messages and keys in a deterministic way" do
+        expect(SortVerifiableContent.call(pact_content_1).to_json).to eq(SortVerifiableContent.call(pact_content_2).to_json)
+      end
+    end
+  end
+end

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

@@ -189,26 +189,53 @@ module PactBroker
       end
 
       describe "find_latest_verification_for_tags" do
-        before do
-          TestDataBuilder.new
-            .create_pact_with_hierarchy("Foo", "1", "Bar")
-            .create_consumer_version_tag("feat-x")
-            .create_verification(provider_version: "5")
-            .use_provider_version("5")
-            .create_provider_version_tag("feat-y")
-            .create_verification(provider_version: "6", number: 2)
-            .use_provider_version("6")
-            .create_provider_version_tag("feat-y")
-            .create_verification(provider_version: "7", number: 3)
-            .create_consumer_version("2")
-            .create_pact
-            .create_verification(provider_version: "8")
+        context "with no revisions" do
+          before do
+            TestDataBuilder.new
+              .create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_consumer_version_tag("feat-x")
+              .create_verification(provider_version: "5")
+              .use_provider_version("5")
+              .create_provider_version_tag("feat-y")
+              .create_verification(provider_version: "6", number: 2)
+              .use_provider_version("6")
+              .create_provider_version_tag("feat-y")
+              .create_verification(provider_version: "7", number: 3)
+              .create_consumer_version("2")
+              .create_pact
+              .create_verification(provider_version: "8")
+          end
+
+          subject { Repository.new.find_latest_verification_for_tags("Foo", "Bar", "feat-x", "feat-y") }
+
+          it "returns the latest verification for a pact with the given consumer tag, by a provider version with the given provider tag" do
+            expect(subject.provider_version_number).to eq "6"
+          end
         end
 
-        subject { Repository.new.find_latest_verification_for_tags("Foo", "Bar", "feat-x", "feat-y") }
+        context "when a verification exists for a pact revision that was then overwritten by a new revision of the pact" do
+          let(:content_1) { { content: 1 }.to_json }
+          let(:content_2) { { content: 2 }.to_json }
+
+          before do
+            TestDataBuilder.new
+              .create_pact_with_hierarchy("Foo", "1", "Bar", content_1)
+              .create_consumer_version_tag("develop")
+              .create_verification(provider_version: "5", number: 1, tag_name: "develop", comment: "not this because pact revised")
+              .create_verification(provider_version: "6", number: 2, tag_name: "develop", comment: "not this because pact revised")
+              .revise_pact(content_2)
+              .create_verification(provider_version: "1", number: 1, tag_name: "develop", comment: "not this because later one exists")
+              .create_verification(provider_version: "2", number: 2, tag_name: "develop", comment: "this one!")
+              .create_consumer_version("2")
+              .create_pact(json_content: content_1)
+          end
+
+          subject { Repository.new.find_latest_verification_for_tags("Foo", "Bar", "develop", "develop") }
 
-        it "returns the latest verification for a pact with the given consumer tag, by a provider version with the given provider tag" do
-          expect(subject.provider_version_number).to eq "6"
+          it "returns the latest verification " do
+            expect(subject.provider_version_number).to eq "2"
+            expect(subject.number).to eq 2
+          end
         end
       end
     end

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

@@ -10,7 +10,7 @@ module PactBroker
       let(:version_number) { "1.2.3" }
 
 
-      describe "#find_by_pacticpant_name_and_latest_tag" do
+      describe "#find_by_pacticipant_name_and_latest_tag" do
         before do
           td.create_consumer("Bar")
             .create_consumer_version("2.3.4")
@@ -23,7 +23,7 @@ module PactBroker
             .create_consumer_version("5.6.7")
         end
 
-        subject { Repository.new.find_by_pacticpant_name_and_latest_tag("Foo", "prod") }
+        subject { Repository.new.find_by_pacticipant_name_and_latest_tag("Foo", "prod") }
 
         it "returns the most recent version that has the specified tag" do
 

data/spec/support/test_data_builder.rb

@@ -168,7 +168,11 @@ class TestDataBuilder
 
   def create_consumer_version version_number = "1.0.#{model_counter}", params = {}
     params.delete(:comment)
+    tag_names = [params.delete(:tag_names), params.delete(:tag_name)].flatten.compact
     @consumer_version = PactBroker::Domain::Version.create(:number => version_number, :pacticipant => @consumer)
+    tag_names.each do | tag_name |
+      PactBroker::Domain::Tag.create(name: tag_name, version: @consumer_version)
+    end
     self
   end
 

data/tasks/rspec.rake

@@ -1,10 +1,12 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = 'spec/**/*_spec.rb'
-end
-
 RSpec::Core::RakeTask.new('spec:quick') do |task|
   task.rspec_opts = '--tag ~@no_db_clean --tag ~@migration'
 end
+
+RSpec::Core::RakeTask.new('spec:slow') do |task|
+  task.rspec_opts = '--tag @no_db_clean --tag @migration'
+end
+
+task :spec => ['spec:quick', 'spec:slow']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -733,6 +733,7 @@ files:
 - lib/pact_broker/api/resources/matrix_for_consumer_and_provider.rb
 - lib/pact_broker/api/resources/pact.rb
 - lib/pact_broker/api/resources/pact_content_diff.rb
+- lib/pact_broker/api/resources/pact_version.rb
 - lib/pact_broker/api/resources/pact_versions.rb
 - lib/pact_broker/api/resources/pact_webhooks.rb
 - lib/pact_broker/api/resources/pact_webhooks_status.rb
@@ -741,6 +742,7 @@ files:
 - lib/pact_broker/api/resources/pacticipants.rb
 - lib/pact_broker/api/resources/pacticipants_for_label.rb
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
+- lib/pact_broker/api/resources/provider_pacts.rb
 - lib/pact_broker/api/resources/relationships.rb
 - lib/pact_broker/api/resources/tag.rb
 - lib/pact_broker/api/resources/triggered_webhook_logs.rb
@@ -833,6 +835,7 @@ files:
 - lib/pact_broker/pacts/pact_version.rb
 - lib/pact_broker/pacts/repository.rb
 - lib/pact_broker/pacts/service.rb
+- lib/pact_broker/pacts/sort_verifiable_content.rb
 - lib/pact_broker/project_root.rb
 - lib/pact_broker/relationships/groupify.rb
 - lib/pact_broker/repositories.rb
@@ -974,6 +977,7 @@ files:
 - spec/features/get_matrix_for_consumer_and_provider_spec.rb
 - spec/features/get_matrix_spec.rb
 - spec/features/get_pact_spec.rb
+- spec/features/get_pact_version.rb
 - spec/features/get_pact_versions_spec.rb
 - spec/features/get_pacticipants_by_label_spec.rb
 - spec/features/get_previous_distinct_version.rb
@@ -1032,6 +1036,7 @@ files:
 - spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
 - spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb
@@ -1043,6 +1048,7 @@ files:
 - spec/lib/pact_broker/api/decorators/webhook_execution_result_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhook_request_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
+- spec/lib/pact_broker/api/pact_broker_urls_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
 - spec/lib/pact_broker/api/resources/badge_spec.rb
 - spec/lib/pact_broker/api/resources/base_resource_spec.rb
@@ -1050,6 +1056,7 @@ files:
 - spec/lib/pact_broker/api/resources/error_handler_spec.rb
 - spec/lib/pact_broker/api/resources/group_spec.rb
 - spec/lib/pact_broker/api/resources/latest_pact_spec.rb
+- spec/lib/pact_broker/api/resources/latest_provider_pacts_spec.rb
 - spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb
 - spec/lib/pact_broker/api/resources/matrix_badge_spec.rb
 - spec/lib/pact_broker/api/resources/matrix_spec.rb
@@ -1057,6 +1064,7 @@ files:
 - spec/lib/pact_broker/api/resources/pact_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipants_spec.rb
+- spec/lib/pact_broker/api/resources/provider_pacts_spec.rb
 - spec/lib/pact_broker/api/resources/tag_spec.rb
 - spec/lib/pact_broker/api/resources/triggered_webhook_logs_spec.rb
 - spec/lib/pact_broker/api/resources/verifications_spec.rb
@@ -1105,6 +1113,7 @@ files:
 - 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/relationships/groupify_spec.rb
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
@@ -1252,6 +1261,7 @@ test_files:
 - spec/features/get_matrix_for_consumer_and_provider_spec.rb
 - spec/features/get_matrix_spec.rb
 - spec/features/get_pact_spec.rb
+- spec/features/get_pact_version.rb
 - spec/features/get_pact_versions_spec.rb
 - spec/features/get_pacticipants_by_label_spec.rb
 - spec/features/get_previous_distinct_version.rb
@@ -1310,6 +1320,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
 - spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb
@@ -1321,6 +1332,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/webhook_execution_result_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhook_request_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
+- spec/lib/pact_broker/api/pact_broker_urls_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
 - spec/lib/pact_broker/api/resources/badge_spec.rb
 - spec/lib/pact_broker/api/resources/base_resource_spec.rb
@@ -1328,6 +1340,7 @@ test_files:
 - spec/lib/pact_broker/api/resources/error_handler_spec.rb
 - spec/lib/pact_broker/api/resources/group_spec.rb
 - spec/lib/pact_broker/api/resources/latest_pact_spec.rb
+- spec/lib/pact_broker/api/resources/latest_provider_pacts_spec.rb
 - spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb
 - spec/lib/pact_broker/api/resources/matrix_badge_spec.rb
 - spec/lib/pact_broker/api/resources/matrix_spec.rb
@@ -1335,6 +1348,7 @@ test_files:
 - spec/lib/pact_broker/api/resources/pact_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipants_spec.rb
+- spec/lib/pact_broker/api/resources/provider_pacts_spec.rb
 - spec/lib/pact_broker/api/resources/tag_spec.rb
 - spec/lib/pact_broker/api/resources/triggered_webhook_logs_spec.rb
 - spec/lib/pact_broker/api/resources/verifications_spec.rb
@@ -1383,6 +1397,7 @@ test_files:
 - 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/relationships/groupify_spec.rb
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb