pact_broker 2.6.0 → 2.7.0.beta.1

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

@@ -61,7 +61,7 @@ module PactBroker
         subject { Repository.new.find "Consumer1", "Provider1", pact.pact_version_sha, 2}
 
         it "finds the latest verifications for the given consumer version" do
-          expect(subject.provider_version).to eq "3.7.4"
+          expect(subject.provider_version_number).to eq "3.7.4"
           expect(subject.consumer_name).to eq "Consumer1"
           expect(subject.provider_name).to eq "Provider1"
           expect(subject.pact_version_sha).to eq pact.pact_version_sha
@@ -95,8 +95,8 @@ module PactBroker
         subject { Repository.new.find_latest_verifications_for_consumer_version("Consumer1", "1.2.3")}
 
         it "finds the latest verifications for the given consumer version" do
-          expect(subject.first.provider_version).to eq "7.8.9"
-          expect(subject.last.provider_version).to eq "6.5.4"
+          expect(subject.first.provider_version_number).to eq "7.8.9"
+          expect(subject.last.provider_version_number).to eq "6.5.4"
         end
       end
 
@@ -116,7 +116,7 @@ module PactBroker
           subject { Repository.new.find_latest_verification_for("Consumer1", "Provider1")}
 
           it "finds the latest verifications for the given consumer version" do
-            expect(subject.provider_version).to eq "7.8.9"
+            expect(subject.provider_version_number).to eq "7.8.9"
           end
         end
 
@@ -142,7 +142,7 @@ module PactBroker
           subject { Repository.new.find_latest_verification_for("Consumer1", "Provider1")}
 
           it "finds the latest verifications for the given consumer version" do
-            expect(subject.provider_version).to eq "7.8.9"
+            expect(subject.provider_version_number).to eq "7.8.9"
           end
         end
 
@@ -173,7 +173,7 @@ module PactBroker
           subject { Repository.new.find_latest_verification_for("Consumer1", "Provider1", 'prod')}
 
           it "finds the latest verifications for the given consumer version with the specified tag" do
-            expect(subject.provider_version).to eq "5.4.3"
+            expect(subject.provider_version_number).to eq "5.4.3"
           end
 
           context "when no verification exists" do
@@ -212,7 +212,7 @@ module PactBroker
           subject { Repository.new.find_latest_verification_for("Consumer1", "Provider1", :untagged)}
 
           it "finds the latest verifications for the given consumer version with no tag" do
-            expect(subject.provider_version).to eq "5.4.3"
+            expect(subject.provider_version_number).to eq "5.4.3"
           end
         end
       end

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

@@ -43,6 +43,12 @@ module PactBroker
           expect(verification.pact_version_id).to_not be_nil
           expect(verification.pact_version).to_not be_nil
         end
+
+        it "sets the provider version" do
+          verification = create_verification
+          expect(verification.provider_version).to_not be nil
+          expect(verification.provider_version_number).to eq '4.5.6'
+        end
       end
 
       describe "#errors" do

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

@@ -5,6 +5,43 @@ module PactBroker
   module Versions
     describe Service do
 
+      describe ".find_versions_by_selector" do
+
+        context "without a version selector" do
+          let(:selector) { "Foo" }
+        end
+
+        context "with a version selector" do
+          before do
+            TestDataBuilder.new
+              .create_pacticipant("Foo")
+              .create_version("1.2.3")
+              .create_version("4.5.6")
+              .create_pacticipant("Bar")
+              .create_version("1.2.3")
+          end
+
+          let(:selector) { "Foo/version/1.2.3" }
+
+          subject { Service.find_versions_by_selector [selector] }
+
+          context "when the version exists" do
+            it "returns the specfied version" do
+              expect(subject.first.number).to eq "1.2.3"
+              expect(subject.first.pacticipant.name).to eq "Foo"
+            end
+          end
+
+          context "when the version does not exist" do
+            let(:selector) { "Wiffle/version/0.0.0" }
+
+            it "returns nil" do
+              expect(subject.first).to eq nil
+            end
+          end
+        end
+      end
+
       describe ".delete" do
         let!(:version) do
           TestDataBuilder.new

data/spec/lib/pact_broker/webhooks/status_spec.rb

@@ -23,6 +23,12 @@ module PactBroker
         its(:to_sym) { is_expected.to eq :not_run }
       end
 
+      context "when all the triggered_webhooks are not_run" do
+        let(:status_1) { TriggeredWebhook::STATUS_NOT_RUN }
+        let(:status_2) { TriggeredWebhook::STATUS_NOT_RUN }
+        its(:to_sym) { is_expected.to eq :not_run }
+      end
+
       context "when the most recent triggered webhooks are successful" do
         its(:to_sym) { is_expected.to eq :success }
       end

data/spec/migrations/44_add_provider_version_to_verification_spec.rb

@@ -0,0 +1,60 @@
+describe 'add provider version relationship to verification (migrate 42-44)', migration: true do
+  before do
+    PactBroker::Database.migrate(42)
+  end
+
+  let(:now) { DateTime.new(2018, 2, 2) }
+  let!(:consumer) { create(:pacticipants, {name: 'Consumer', created_at: now, updated_at: now}) }
+  let!(:provider) { create(:pacticipants, {name: 'Provider', created_at: now, updated_at: now}) }
+  let!(:provider) { create(:pacticipants, {name: 'Provider', created_at: now, updated_at: now}) }
+  let!(:consumer_version) { create(:versions, {number: '1.2.3', order: 1, pacticipant_id: consumer[:id], created_at: now, updated_at: now}) }
+  let!(:pact_version) { create(:pact_versions, {content: {some: 'json'}.to_json, sha: '1234', consumer_id: consumer[:id], provider_id: provider[:id], created_at: now}) }
+  let!(:pact_publication) do
+    create(:pact_publications, {
+      consumer_version_id: consumer_version[:id],
+      provider_id: provider[:id],
+      revision_number: 1,
+      pact_version_id: pact_version[:id],
+      created_at: (now - 1)
+    })
+  end
+  let!(:verification) do
+    create(:verifications, {
+      number: 1,
+      success: true,
+      provider_version: '1.2.3',
+      pact_version_id: pact_version[:id],
+      execution_date: now,
+      created_at: now
+    })
+  end
+
+  subject { PactBroker::Database.migrate(46) }
+
+  it "creates a version object" do
+    expect { subject }.to change { PactBroker::Domain::Version.count }.by(1)
+  end
+
+  it "sets the foreign key to the new version" do
+    subject
+    expect(PactBroker::Domain::Verification.first.provider_version.number).to eq '1.2.3'
+  end
+
+  it "sets the created_at date of the new version to the created_at of the verification" do
+    subject
+    expect(PactBroker::Domain::Verification.first.provider_version.created_at.to_datetime).to eq now
+  end
+
+  context "when the version already exists" do
+    let!(:provider_version) { create(:versions, {number: '1.2.3', order: 1, pacticipant_id: provider[:id], created_at: now, updated_at: now}) }
+
+    it "does not create a version object" do
+      expect { subject }.to_not change { PactBroker::Domain::Version.count }
+    end
+
+    it "sets the foreign key to the existing version" do
+      subject
+      expect(PactBroker::Domain::Verification.first.provider_version.number).to eq '1.2.3'
+    end
+  end
+end

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -2,6 +2,18 @@ require 'spec/support/test_data_builder'
 
 Pact.provider_states_for "Pact Broker Client" do
 
+  provider_state "the pact for Foo version 1.2.3 has been verified by Bar version 4.5.6" do
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .create_verification(provider_version: "4.5.6")
+        .create_verification(provider_version: "7.8.9", number: 2)
+        .create_consumer_version("2.0.0")
+        .create_pact
+        .create_verification(provider_version: "4.5.6")
+    end
+  end
+
   provider_state "the 'Pricing Service' does not exist in the pact-broker" do
     no_op
   end

data/spec/support/shared_examples_for_responses.rb

@@ -16,6 +16,10 @@ RSpec::Matchers.define :be_a_hal_json_success_response do
     expect(actual.status).to be 200
     expect(actual.headers['Content-Type']).to eq 'application/hal+json;charset=utf-8'
   end
+
+  failure_message do
+    "Expected successful json response, got #{actual.status} #{actual.headers['Content-Type']} with body #{actual.body}"
+  end
 end
 
 RSpec::Matchers.define :be_a_json_response do

data/spec/support/test_data_builder.rb

@@ -117,12 +117,22 @@ class TestDataBuilder
     self
   end
 
+  def use_consumer consumer_name
+    @consumer = PactBroker::Domain::Pacticipant.find(:name => consumer_name)
+    self
+  end
+
   def create_provider provider_name = "Provider #{model_counter}"
     create_pacticipant provider_name
     @provider = @pacticipant
     self
   end
 
+  def use_provider provider_name
+    @provider = PactBroker::Domain::Pacticipant.find(:name => provider_name)
+    self
+  end
+
   def create_version version_number = "1.0.#{model_counter}"
     @version = PactBroker::Domain::Version.create(:number => version_number, :pacticipant => @pacticipant)
     self
@@ -133,6 +143,11 @@ class TestDataBuilder
     self
   end
 
+  def use_consumer_version version_number
+    @consumer_version = PactBroker::Domain::Version.where(pacticipant_id: @consumer.id, number: version_number).single_record
+    self
+  end
+
   def create_tag tag_name
     @tag = PactBroker::Domain::Tag.create(name: tag_name, version: @version)
     self
@@ -156,6 +171,11 @@ class TestDataBuilder
     self
   end
 
+  def create_same_pact params = {}
+    last_pact_version = PactBroker::Pacts::PactVersion.order(:id).last
+    create_pact json_content: last_pact_version.content
+  end
+
   def revise_pact json_content = nil
     json_content = json_content ? json_content : {random: rand}.to_json
     @pact = PactBroker::Pacts::Repository.new.update(@pact.id, json_content: json_content)
@@ -201,9 +221,12 @@ class TestDataBuilder
   end
 
   def create_verification parameters = {}
-    default_parameters = {success: true, provider_version: '4.5.6', number: 1}
-    verification = PactBroker::Domain::Verification.new(default_parameters.merge(parameters))
-    @verification = PactBroker::Verifications::Repository.new.create(verification, @pact)
+    provider_version_number = parameters[:provider_version] || '4.5.6'
+    default_parameters = {success: true, number: 1}
+    parameters = default_parameters.merge(parameters)
+    parameters.delete(:provider_version)
+    verification = PactBroker::Domain::Verification.new(parameters)
+    @verification = PactBroker::Verifications::Repository.new.create(verification, provider_version_number, @pact)
     self
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0.beta.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -491,6 +491,11 @@ files:
 - db/migrations/40_create_latest_triggered_webhooks_view.rb
 - db/migrations/41_migrate_execution_data.rb
 - db/migrations/42_delete_orphan_webhook_data.rb
+- db/migrations/43_add_provider_version_to_verification.rb
+- db/migrations/44_populate_verifications_provider_version_id.rb
+- db/migrations/45_set_verification_provider_number_nullable.rb
+- db/migrations/46_recreate_latest_verifications.rb
+- db/migrations/47_create_all_verifications.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
@@ -542,6 +547,7 @@ files:
 - lib/pact_broker/api/decorators/embedded_version_decorator.rb
 - lib/pact_broker/api/decorators/label_decorator.rb
 - lib/pact_broker/api/decorators/latest_pact_decorator.rb
+- lib/pact_broker/api/decorators/matrix_decorator.rb
 - lib/pact_broker/api/decorators/pact_collection_decorator.rb
 - lib/pact_broker/api/decorators/pact_decorator.rb
 - lib/pact_broker/api/decorators/pact_details_decorator.rb
@@ -577,6 +583,8 @@ files:
 - lib/pact_broker/api/resources/latest_pacts.rb
 - lib/pact_broker/api/resources/latest_provider_pacts.rb
 - lib/pact_broker/api/resources/latest_verifications_for_consumer_version.rb
+- lib/pact_broker/api/resources/matrix.rb
+- 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_versions.rb
@@ -653,6 +661,8 @@ files:
 - lib/pact_broker/labels/service.rb
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
+- lib/pact_broker/matrix/repository.rb
+- lib/pact_broker/matrix/service.rb
 - lib/pact_broker/messages.rb
 - lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb
 - lib/pact_broker/pacticipants/repository.rb
@@ -684,14 +694,18 @@ files:
 - lib/pact_broker/ui/controllers/base_controller.rb
 - lib/pact_broker/ui/controllers/clusters.rb
 - lib/pact_broker/ui/controllers/groups.rb
+- lib/pact_broker/ui/controllers/matrix.rb
 - lib/pact_broker/ui/controllers/relationships.rb
 - lib/pact_broker/ui/helpers/url_helper.rb
 - lib/pact_broker/ui/view_models/clusters.rb
+- lib/pact_broker/ui/view_models/matrix_line.rb
 - lib/pact_broker/ui/view_models/relationship.rb
 - lib/pact_broker/ui/view_models/relationships.rb
 - lib/pact_broker/ui/views/clusters/show.haml
 - lib/pact_broker/ui/views/groups/show.html.erb
 - lib/pact_broker/ui/views/layouts/main.haml
+- lib/pact_broker/ui/views/matrix/show.haml
+- lib/pact_broker/ui/views/relationships/show-prod-tags.haml
 - lib/pact_broker/ui/views/relationships/show.haml
 - lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb
 - lib/pact_broker/verifications/repository.rb
@@ -777,6 +791,8 @@ files:
 - spec/features/get_latest_tagged_pact_spec.rb
 - spec/features/get_latest_untagged_pact_badge_spec.rb
 - spec/features/get_latest_untagged_pact_spec.rb
+- 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_versions_spec.rb
 - spec/features/get_pacticipants_by_label_spec.rb
@@ -813,6 +829,7 @@ files:
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/matrix_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb
@@ -836,6 +853,7 @@ files:
 - 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_verifications_for_consumer_version_spec.rb
+- spec/lib/pact_broker/api/resources/matrix_spec.rb
 - spec/lib/pact_broker/api/resources/pact_spec.rb
 - spec/lib/pact_broker/api/resources/pact_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
@@ -867,6 +885,8 @@ files:
 - spec/lib/pact_broker/groups/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
 - spec/lib/pact_broker/labels/service_spec.rb
+- spec/lib/pact_broker/matrix/repository_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
 - spec/lib/pact_broker/pacticipants/repository_spec.rb
@@ -875,6 +895,7 @@ files:
 - spec/lib/pact_broker/pacts/diff_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
@@ -908,6 +929,7 @@ files:
 - spec/migrations/34_pact_revisions_spec.rb
 - 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/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/spec_helper.rb
@@ -977,9 +999,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11
@@ -1002,6 +1024,8 @@ test_files:
 - spec/features/get_latest_tagged_pact_spec.rb
 - spec/features/get_latest_untagged_pact_badge_spec.rb
 - spec/features/get_latest_untagged_pact_spec.rb
+- 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_versions_spec.rb
 - spec/features/get_pacticipants_by_label_spec.rb
@@ -1038,6 +1062,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/matrix_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb
@@ -1061,6 +1086,7 @@ test_files:
 - 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_verifications_for_consumer_version_spec.rb
+- spec/lib/pact_broker/api/resources/matrix_spec.rb
 - spec/lib/pact_broker/api/resources/pact_spec.rb
 - spec/lib/pact_broker/api/resources/pact_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
@@ -1092,6 +1118,8 @@ test_files:
 - spec/lib/pact_broker/groups/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
 - spec/lib/pact_broker/labels/service_spec.rb
+- spec/lib/pact_broker/matrix/repository_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
 - spec/lib/pact_broker/pacticipants/repository_spec.rb
@@ -1100,6 +1128,7 @@ test_files:
 - spec/lib/pact_broker/pacts/diff_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
@@ -1133,6 +1162,7 @@ test_files:
 - spec/migrations/34_pact_revisions_spec.rb
 - 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/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/spec_helper.rb