pact_broker 2.24.0 → 2.25.0

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

@@ -19,26 +19,6 @@ module PactBroker
         rows.collect{ |r| shorten_row(r) }
       end
 
-      describe "refresh" do
-        before do
-          td.create_pact_with_hierarchy("Foo", "1", "Bar")
-          Row.refresh(pacticipant_id: td.provider.id)
-        end
-
-        context "when deleting an object in the block" do
-          it "removes the relevant lines from the matrix" do
-            expect(Row.count).to_not eq 0
-            Repository.new.refresh(pacticipant_name: "Bar") { PactBroker::Pacticipants::Service.delete("Bar") }
-            expect(Row.count).to eq 0
-          end
-
-          it "yields the block" do
-            Repository.new.refresh(pacticipant_name: "Bar") { PactBroker::Pacticipants::Service.delete("Bar") }
-            expect(PactBroker::Domain::Pacticipant.where(name: "Bar").count).to eq 0
-          end
-        end
-      end
-
       describe "find" do
         before do
           # A1 - B1

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

@@ -26,62 +26,6 @@ module PactBroker
         end
       end
 
-      describe "refresh", migration: true do
-        let(:td) { TestDataBuilder.new(auto_refresh_matrix: false) }
-
-        before do
-          PactBroker::Database.migrate
-          td.create_pact_with_hierarchy("Foo", "1", "Bar")
-        end
-
-        context "with only a consumer_id" do
-          subject { Row.refresh(consumer_id: td.consumer.id) }
-
-          it "refreshes the data for the consumer" do
-            subject
-            expect(Row.all.collect(&:values)).to contain_hash(provider_name: "Bar", consumer_name: "Foo")
-          end
-        end
-
-        context "with only a provider_id" do
-          subject { Row.refresh(provider_id: td.provider.id) }
-
-          it "refreshes the data for the provider" do
-            subject
-            expect(Row.all.collect(&:values)).to contain_hash(provider_name: "Bar", consumer_name: "Foo")
-          end
-        end
-
-        context "with both consumer_id and provider_id" do
-          subject { Row.refresh(provider_id: td.provider.id, consumer_id: td.consumer.id) }
-
-          it "refreshes the data for the consumer and provider" do
-            subject
-            expect(Row.all.collect(&:values)).to contain_hash(provider_name: "Bar", consumer_name: "Foo")
-          end
-        end
-
-        context "when there was existing data" do
-          it "deletes the existing data before inserting the new data" do
-            Row.refresh(provider_id: td.provider.id, consumer_id: td.consumer.id)
-            expect(Row.count).to eq 1
-            td.create_consumer_version("2")
-              .create_pact
-            Row.refresh(provider_id: td.provider.id, consumer_id: td.consumer.id)
-            expect(Row.count).to eq 2
-          end
-        end
-
-        context "with a pacticipant_id" do
-          subject { Row.refresh(pacticipant_id: td.provider.id) }
-
-          it "refreshes the data for both consumer and provider roles" do
-            subject
-            expect(Row.all.collect(&:values)).to contain_hash(provider_name: "Bar", consumer_name: "Foo")
-          end
-        end
-      end
-
       describe "<=>" do
         let(:row_1) do
           Row.new(

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

@@ -24,6 +24,11 @@ module PactBroker
           expect{subject}.to change{ PactPublication.count }.by(1)
         end
 
+        it "sets the consumer_id" do
+          subject
+          expect(PactPublication.first.consumer_id).to eq consumer.id
+        end
+
         it "returns a Pact::Model" do
           expect(subject).to be_instance_of(PactBroker::Domain::Pact)
         end
@@ -508,27 +513,74 @@ module PactBroker
             .create_consumer("Consumer")
             .create_consumer_version("1.2.2")
             .create_provider("Provider")
+            .create_consumer_version_tag("a_tag")
+            .create_pact
+            .create_consumer_version("1.2.3")
             .create_pact
             .create_consumer_version("1.2.4")
+            .create_consumer_version_tag("another_tag")
             .create_pact
-            .create_consumer_version("1.2.6")
+            .create_consumer_version("1.2.5")
+            .create_consumer_version_tag("a_tag")
+            .create_pact
+            .create_consumer_version("1.2.7")
+            .create_consumer_version_tag("another_tag")
             .create_pact
             .create_provider("Another Provider")
-            .create_consumer_version("1.2.5")
+            .create_consumer_version("1.2.6")
+            .create_consumer_version_tag("a_tag")
             .create_pact
         end
 
-        let(:pact) { Repository.new.find_latest_pact "Consumer", "Provider"  }
+        context "regardless of tag" do
+          context "when a previous version with a pact exists" do
 
-        subject  { Repository.new.find_previous_pact pact }
+            let(:pact) { Repository.new.find_latest_pact "Consumer", "Provider", "another_tag" }
 
-        it "finds the previous pact" do
-          expect(subject.consumer_version_number).to eq "1.2.4"
-          expect(subject.consumer_version.number).to eq "1.2.4"
+            subject  { Repository.new.find_previous_pact pact }
+
+            it "finds the previous pact" do
+              expect(subject.consumer_version_number).to eq "1.2.5"
+            end
+
+            it "sets the json_content" do
+              expect(subject.json_content).to_not be nil
+            end
+          end
         end
 
-        it "sets the json_content" do
-          expect(subject.json_content).to_not be nil
+        context "by tag" do
+          context "when a previous version with a pact with a specific tag exists" do
+
+            let(:pact) { Repository.new.find_latest_pact "Consumer", "Provider", "a_tag"  }
+
+            subject  { Repository.new.find_previous_pact pact, "a_tag" }
+
+            it "finds the previous pact" do
+              expect(subject.consumer_version_number).to eq "1.2.2"
+            end
+
+            it "sets the json_content" do
+              expect(subject.json_content).to_not be nil
+            end
+          end
+        end
+
+        context "that is untagged" do
+          context "when a previous version with a an untagged pact exists" do
+
+            let(:pact) { Repository.new.find_latest_pact "Consumer", "Provider"  }
+
+            subject  { Repository.new.find_previous_pact pact, :untagged }
+
+            it "finds the previous pact" do
+              expect(subject.consumer_version_number).to eq "1.2.3"
+            end
+
+            it "sets the json_content" do
+              expect(subject.json_content).to_not be nil
+            end
+          end
         end
       end
 

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

@@ -34,35 +34,83 @@ module PactBroker
         let(:json_content) { { 'some' => 'json'}.to_json }
         let(:pact) { instance_double(PactBroker::Domain::Pact, json_content: json_content)}
 
-        before do
-          allow_any_instance_of(Pacts::Repository).to receive(:find_previous_pact).and_return(previous_pact)
-        end
-
         subject { Service.pact_is_new_or_pact_has_changed_since_previous_version? pact }
 
-        context "when a previous pact is found" do
-          let(:previous_pact) { instance_double(PactBroker::Domain::Pact, json_content: previous_json_content)}
-          let(:previous_json_content) { {'some' => 'json'}.to_json }
+        context "when consumer version is untagged" do
+          before do
+            allow(pact).to receive(:consumer_version_tag_names).and_return([]);
+            allow_any_instance_of(Pacts::Repository).to receive(:find_previous_pact).with(pact, :untagged).and_return(previous_pact)
+          end
+
+          context "when a previous pact is found" do
+            let(:previous_pact) { instance_double(PactBroker::Domain::Pact, json_content: previous_json_content)}
+            let(:previous_json_content) { {'some' => 'json'}.to_json }
 
-          context "when the json_content is the same" do
-            it "returns false" do
-              expect(subject).to be_falsey
+            context "when the json_content is the same" do
+              it "returns false" do
+                expect(subject).to be_falsey
+              end
+            end
+
+            context "when the json_content is not the same" do
+              let(:previous_json_content) { {'some-other' => 'json'}.to_json }
+              it "returns truthy" do
+                expect(subject).to be_truthy
+              end
             end
           end
 
-          context "when the json_content is not the same" do
-            let(:previous_json_content) { {'some-other' => 'json'}.to_json }
-            it "returns truthy" do
+          context "when a previous pact is not found" do
+            let(:previous_pact) { nil }
+
+            it "returns true" do
               expect(subject).to be_truthy
             end
           end
         end
 
-        context "when a previous pact is not found" do
-          let(:previous_pact) { nil }
+        context "when consumer version has two tags" do
+          before do
+            allow(pact).to receive(:consumer_version_tag_names).and_return(['tag_1', 'tag_2']);
+            allow_any_instance_of(Pacts::Repository).to receive(:find_previous_pact).with(pact, 'tag_1').and_return(previous_pact_tag_1)
+            allow_any_instance_of(Pacts::Repository).to receive(:find_previous_pact).with(pact, 'tag_2').and_return(previous_pact_tag_2)
+          end
+
+          context "when a previous pact is found for both tags" do
+            let(:previous_pact_tag_1) { instance_double(PactBroker::Domain::Pact, json_content: previous_json_content_tag_1)}
+            let(:previous_json_content_tag_1) { {'some' => 'json'}.to_json }
+
+            let(:previous_pact_tag_2) { instance_double(PactBroker::Domain::Pact, json_content: previous_json_content_tag_2)}
+            let(:previous_json_content_tag_2) { {'some' => 'json'}.to_json }
 
-          it "returns true" do
-            expect(subject).to be_truthy
+            context "when the json_content of both previous pacts and new pact is the same" do
+              it "returns false" do
+                expect(subject).to be_falsey
+              end
+            end
+
+            context "when the json_content of first previous pact is not the same" do
+              let(:previous_json_content_tag_1) { {'some-other' => 'json'}.to_json }
+              it "returns truthy" do
+                expect(subject).to be_truthy
+              end
+            end
+
+            context "when the json_content of second previous pact not the same" do
+              let(:previous_json_content_tag_2) { {'some-other' => 'json'}.to_json }
+              it "returns truthy" do
+                expect(subject).to be_truthy
+              end
+            end
+          end
+
+          context "when no previous pacts are found" do
+            let(:previous_pact_tag_1) { nil }
+            let(:previous_pact_tag_2) { nil }
+
+            it "returns true" do
+              expect(subject).to be_truthy
+            end
           end
         end
       end

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

@@ -9,7 +9,7 @@ module PactBroker
 
         let(:consumer) { instance_double("PactBroker::Domain::Pacticipant", name: 'Consumer Name')}
         let(:provider) { instance_double("PactBroker::Domain::Pacticipant", name: 'Provider Name')}
-        let(:latest_pact) { instance_double("PactBroker::Domain::Pact") }
+        let(:latest_pact) { instance_double("PactBroker::Domain::Pact", consumer_version_number: "1.2.3") }
         let(:latest_verification) { instance_double("PactBroker::Domain::Verification") }
         let(:domain_relationship) { PactBroker::Domain::IndexItem.new(consumer, provider, latest_pact, latest, latest_verification, [], [], tags, latest_verification_latest_tags)}
         let(:tags) { [] }
@@ -22,7 +22,8 @@ module PactBroker
 
         its(:consumer_name) { should eq 'Consumer Name'}
         its(:provider_name) { should eq 'Provider Name'}
-        its(:pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/latest" }
+        its(:latest_pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/latest" }
+        its(:pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/version/1.2.3" }
         its(:pact_matrix_url) { should eq "/matrix/provider/Provider%20Name/consumer/Consumer%20Name" }
         its(:consumer_group_url) { should eq "/groups/Consumer%20Name" }
         its(:provider_group_url) { should eq "/groups/Provider%20Name" }

data/spec/migrations/44_add_provider_version_to_verification_spec.rb

@@ -6,7 +6,6 @@ describe 'add provider version relationship to verification (migrate 42-44)', mi
   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

data/spec/service_consumers/provider_states_for_pact_ruby.rb

@@ -6,6 +6,20 @@ Pact.provider_states_for "Pact Ruby" do
     no_op
   end
 
+  provider_state "the relation for retrieving WIP pacts exists in the index resource" do
+    no_op
+  end
+
+  provider_state "consumer-1 has a WIP pact with provider provider-1" do
+    set_up do
+      TestDataBuilder.new
+        .create_provider('provider-1')
+        .create_consumer('consumer-1')
+        .create_consumer_version('1.3.0')
+        .create_pact
+    end
+  end
+
   provider_state 'consumer-1 and consumer-2 have pacts with provider provider-1' do
     set_up do
       TestDataBuilder.new

data/spec/support/test_data_builder.rb

@@ -40,28 +40,14 @@ class TestDataBuilder
   attr_reader :webhook
   attr_reader :webhook_execution
   attr_reader :triggered_webhook
-  attr_accessor :auto_refresh_matrix
 
   def initialize(params = {})
-    @auto_refresh_matrix = params.fetch(:auto_refresh_matrix, true)
   end
 
   def comment *args
     self
   end
 
-  def refresh_matrix
-    if auto_refresh_matrix
-      params = {}
-      params[:consumer_name] = consumer.name if consumer
-      params[:provider_name] = provider.name if provider
-      matrix_service.refresh(params)
-      # Row is not used in production code, but the tests depend on it
-      # Technically this code is expecting ids, but it will work with names too
-      PactBroker::Matrix::Row.refresh(params)
-    end
-  end
-
   def create_pricing_service
     @pricing_service_id = pacticipant_repository.create(:name => 'Pricing Service', :repository_url => 'git@git.realestate.com.au:business-systems/pricing-service').save(raise_on_save_failure: true).id
     self
@@ -206,7 +192,6 @@ class TestDataBuilder
   def create_consumer_version_tag tag_name, params = {}
     params.delete(:comment)
     @tag = PactBroker::Domain::Tag.create(name: tag_name, version: @consumer_version)
-    refresh_matrix
     self
   end
 
@@ -227,7 +212,6 @@ class TestDataBuilder
     set_created_at_if_set params[:created_at], :pact_publications, {id: @pact.id}
     set_created_at_if_set params[:created_at], :pact_versions, {sha: @pact.pact_version_sha}
     @pact = PactBroker::Pacts::PactPublication.find(id: @pact.id).to_domain
-    refresh_matrix
     self
   end
 
@@ -241,7 +225,6 @@ class TestDataBuilder
   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)
-    refresh_matrix
     self
   end
 
@@ -328,7 +311,6 @@ class TestDataBuilder
         PactBroker::Domain::Tag.create(name: tag_name, version: @provider_version)
       end
     end
-    refresh_matrix
     self
   end
 

data/tasks/database/annotate.rb

@@ -0,0 +1,40 @@
+require 'sequel/annotate'
+
+module PactBroker
+  class Annotate
+    def self.call
+      annotation_configuration.each_pair do | klass, path |
+        puts "Annotating #{klass}"
+        sa = Sequel::Annotate.new(klass)
+        sa.annotate(path)
+      end
+    end
+
+    def self.annotation_configuration
+      sequel_domain_classes.each_with_object({}) do | klass, configs |
+        file_path = file_path_for_class(klass)
+        if File.exist?(file_path)
+          configs[klass] = file_path
+        else
+          puts "Skipping annotation for #{klass} as the generated file path #{file_path} does not exist"
+        end
+      end
+    end
+
+    def self.sequel_domain_classes
+
+      Dir.chdir("lib") { Dir.glob("**/*.rb") }.sort.each do | path |
+        require path
+      end
+
+      ObjectSpace
+        .each_object(::Class).select {|klass| klass < ::Sequel::Model }
+        .select{ |klass| klass.name && klass.name.start_with?("PactBroker::") }
+        .sort{ | c1, c2| c1.name <=> c2.name }
+    end
+
+    def self.file_path_for_class klass
+      "lib/" + klass.name.gsub('::', '/').gsub(/([a-z])([A-Z])/) {|match| match[0] + "_" + match[1].downcase }.downcase + ".rb"
+    end
+  end
+end

data/tasks/db.rake

@@ -96,6 +96,14 @@ namespace :db do
     PactBroker::Database.ensure_database_dir_exists
   end
 
+  desc 'Annotate the Sequel domain classes with schema information'
+  task :annotate =>['db:set_postgres_database_adapter', 'db:migrate'] do
+    load 'tasks/database/annotate.rb'
+    require 'pact_broker/db'
+    PactBroker::DB.connection = PactBroker::Database.database
+    PactBroker::Annotate.call
+  end
+
   # task :create => 'db:env' do
   #   PactBroker::Database.create
   # end
@@ -105,6 +113,10 @@ namespace :db do
     ENV['RACK_ENV'] = 'test'
   end
 
+  task :set_postgres_database_adapter do
+    ENV['DATABASE_ADAPTER'] = 'postgres'
+  end
+
   # Private
   task 'env:nonprod' => ['bundler:setup'] do
     # Allow default RACK_ENV to be set when not in production