pact_broker 2.6.0 → 2.7.0.beta.1

data/lib/pact_broker/ui/views/relationships/show-prod-tags.haml

@@ -0,0 +1,83 @@
+%body
+  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
+  %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
+  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
+  %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
+  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
+  %nav.navbase-default.navbar-right{role: "navigation"}
+    .container
+      %ul
+        %li.navbar-right
+          %a{href: '/hal-browser/browser.html'}
+            HAL Browser
+  .container
+    %h1.page-header
+      Pacts
+    %table.table.table-bordered.table-striped{id: 'relationships'}
+      %thead
+        %th.consumer
+          Consumer
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th.tag
+          Version
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th.pact
+        %th.provider
+          Provider
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th.tag
+          Version
+          %span.glyphicon.glyphicon-sort.relationships-sort
+        %th
+          Published
+        %th
+          Webhook<br>status
+        %th
+          Last<br>verified
+      %tbody
+
+      - relationships.each do | relationship |
+        %tr
+          %td.consumer
+            %a{:href => relationship.consumer_group_url}
+              = relationship.consumer_name
+          %td
+            = relationship.consumer_version_number
+            %span{style: 'color:gray'}
+              = relationship.tag_names
+          %td.pact
+            %a{:href => relationship.pact_url, :title => "View pact"}
+              %span.pact
+          %td.provider
+            %a{:href => relationship.provider_group_url}
+              = relationship.provider_name
+          %td
+            = relationship.provider_version_number
+          %td
+            = relationship.publication_date_of_latest_pact.gsub("about ", "")
+          %td{class: relationship.webhook_status}
+            - if relationship.show_webhook_status?
+              %a{:href => relationship.webhook_url}
+                = relationship.webhook_label
+
+          %td{class: relationship.verification_status, title: relationship.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left"}
+            %div
+              = relationship.last_verified_date.gsub("about ", "")
+              - if relationship.warning?
+                %span.glyphicon.glyphicon-warning-sign{'aria-hidden':true}
+    %div.relationships-size
+      = relationships.size_label
+
+:javascript
+  $(function(){
+    $("#relationships").tablesorter();
+  });
+
+  $(document).ready(function(){
+    $("span.pact").load("/images/doc-text.svg");
+    $('td[data-toggle="tooltip"]').each(function(index, td){
+      //appended tooltip div screws up table if it's appended after a
+      //td, so need to append it to a div
+      $(td).tooltip({container: $(td).first()});
+    });
+  });

data/lib/pact_broker/ui/views/relationships/show.haml

@@ -40,7 +40,7 @@
             %a{:href => relationship.consumer_group_url}
               = relationship.consumer_name
           %td.pact
-            %a{:href => relationship.latest_pact_url, :title => "View pact"}
+            %a{:href => relationship.pact_url, :title => "View pact"}
               %span.pact
           %td.provider
             %a{:href => relationship.provider_group_url}

data/lib/pact_broker/verifications/repository.rb

@@ -7,9 +7,13 @@ module PactBroker
     class Repository
 
       include PactBroker::Repositories::Helpers
+      include PactBroker::Repositories
 
-      def create verification, pact
+      def create verification, provider_version_number, pact
+        provider = pacticipant_repository.find_by_name(pact.provider_name)
+        version = version_repository.find_by_pacticipant_id_and_number_or_create(provider.id, provider_version_number)
         verification.pact_version_id = pact_version_id_for(pact)
+        verification.provider_version = version
         verification.save
       end
 
@@ -39,6 +43,9 @@ module PactBroker
           .all
       end
 
+      # The most recent verification for the latest revision of the pact
+      # belonging to the version with the largest consumer_version_order.
+
       def find_latest_verification_for consumer_name, provider_name, tag = nil
         query = LatestVerificationsByConsumerVersion
           .select_all_qualified

data/lib/pact_broker/verifications/service.rb

@@ -19,9 +19,10 @@ module PactBroker
       def create next_verification_number, params, pact
         PactBroker.logger.info "Creating verification #{next_verification_number} for pact_id=#{pact.id} from params #{params}"
         verification = PactBroker::Domain::Verification.new
+        provider_version_number = params.fetch('providerApplicationVersion')
         PactBroker::Api::Decorators::VerificationDecorator.new(verification).from_hash(params)
         verification.number = next_verification_number
-        verification_repository.create(verification, pact)
+        verification_repository.create(verification, provider_version_number, pact)
       end
 
       def errors params

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.6.0'
+  VERSION = '2.7.0.beta.1'
 end

data/lib/pact_broker/versions/service.rb

@@ -16,6 +16,13 @@ module PactBroker
         pact_repository.delete_by_version_id version.id
         version_repository.delete_by_id version.id
       end
+
+      def self.find_versions_by_selector selectors
+        selectors.collect do | selector |
+          pacticipant_name, type, number = selector.split("/")
+          version_repository.find_by_pacticipant_name_and_number pacticipant_name, number
+        end
+      end
     end
   end
 end

data/lib/pact_broker/webhooks/status.rb

@@ -13,7 +13,7 @@ module PactBroker
 
       def to_sym
         return :none if webhooks.empty?
-        return :not_run if latest_triggered_webhooks.empty?
+        return :not_run if latest_triggered_webhooks.empty? || latest_triggered_webhooks.all?{|w| w.status == "not_run"}
         if latest_triggered_webhooks.any?{|w| w.status == "retrying" }
           return :retrying
         end

data/lib/rack/pact_broker/convert_file_extension_to_accept_header.rb

@@ -7,7 +7,7 @@ module Rack
 
     class ConvertFileExtensionToAcceptHeader
 
-      EXTENSIONS = {".csv" => "text/csv", ".svg" => "image/svg+xml"}
+      EXTENSIONS = {".csv" => "text/csv", ".svg" => "image/svg+xml", ".json" => "application/hal+json"}
       EXTENSION_REGEXP = /\.\w+$/
 
       def initialize app

data/script/seed.rb

@@ -59,9 +59,12 @@ TestDataBuilder.new
   .create_verification(provider_version: "1.4.234", success: true, execution_date: DateTime.now - 15)
   .revise_pact
   .create_consumer_version("1.2.101")
+  .create_consumer_version_tag('prod')
   .publish_pact
+  .create_verification(provider_version: "9.9.10", success: false, execution_date: DateTime.now - 15)
   .create_consumer_version("1.2.102")
   .publish_pact(created_at: (Date.today - 7).to_datetime)
+  .create_verification(provider_version: "9.9.9", success: true, execution_date: DateTime.now - 14)
   .create_provider("Animals")
   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
   .publish_pact(created_at: (Time.now - 140).to_datetime)
@@ -76,6 +79,8 @@ TestDataBuilder.new
   .create_provider("The back end")
   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
   .create_consumer_version("1.2.106")
+  .create_consumer_version_tag("production")
+  .create_consumer_version_tag("feat-x")
   .publish_pact
   .create_consumer("Some other app")
   .create_provider("A service")

data/spec/features/get_matrix_for_consumer_and_provider_spec.rb

@@ -0,0 +1,25 @@
+require 'spec/support/test_data_builder'
+
+describe "Get matrix for consumer and provider" do
+  before do
+    TestDataBuilder.new
+      .create_pact_with_hierarchy('Consumer', '1.0.0', 'Provider')
+      .create_verification(provider_version: '4.5.6')
+  end
+
+  let(:path) { "/matrix/provider/Provider/consumer/Consumer" }
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path; last_response }
+
+  it "returns a 200 HAL JSON response" do
+    expect(subject).to be_a_hal_json_success_response
+  end
+
+  it "returns the JSON representation of the matrix" do
+    expect(last_response_body[:matrix][0][:consumer]).to be_instance_of(Hash)
+    expect(last_response_body[:matrix][0][:provider]).to be_instance_of(Hash)
+    expect(last_response_body[:matrix][0][:pact]).to be_instance_of(Hash)
+    expect(last_response_body[:matrix][0][:verificationResult]).to be_instance_of(Hash)
+  end
+end

data/spec/features/get_matrix_spec.rb

@@ -0,0 +1,31 @@
+require 'spec/support/test_data_builder'
+
+describe "Get matrix for consumer and provider" do
+  before do
+    TestDataBuilder.new
+      .create_pact_with_hierarchy('Consumer', '1.0.0', 'Provider')
+      .create_verification(provider_version: '4.5.6')
+  end
+
+  let(:path) { "/matrix" }
+  let(:params) do
+    {
+      selectors: ['Consumer/version/1.0.0','Provider/version/4.5.6']
+    }
+  end
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path, params; last_response }
+
+  it "returns a 200 HAL JSON response" do
+    expect(subject).to be_a_hal_json_success_response
+  end
+
+  it "returns the JSON representation of the matrix" do
+    expect(last_response_body[:matrix][0][:consumer]).to be_instance_of(Hash)
+    expect(last_response_body[:matrix][0][:provider]).to be_instance_of(Hash)
+    expect(last_response_body[:matrix][0][:pact]).to be_instance_of(Hash)
+    expect(last_response_body[:matrix][0][:verificationResult]).to be_instance_of(Hash)
+  end
+end
+

data/spec/lib/pact_broker/api/decorators/matrix_decorator_spec.rb

@@ -0,0 +1,133 @@
+require 'pact_broker/api/decorators/matrix_decorator'
+
+module PactBroker
+  module Api
+    module Decorators
+      describe MatrixPactDecorator do
+        describe "to_json" do
+          let(:verification_date) { DateTime.new(2017, 12, 31) }
+          let(:pact_created_at) { DateTime.new(2017, 1, 1) }
+          let(:line_1) do
+            {
+              consumer_name: "Consumer",
+              consumer_version_number: "1.0.0",
+              pact_version_sha: "1234",
+              pact_created_at: pact_created_at,
+              provider_version_number: "4.5.6",
+              provider_name: "Provider",
+              success: true,
+              number: 1,
+              build_url: nil,
+              verification_executed_at: verification_date
+            }
+          end
+
+          let(:line_2) do
+            {
+              consumer_name: "Consumer",
+              consumer_version_number: "1.0.0",
+              pact_version_sha: "1234",
+              pact_created_at: pact_created_at,
+              provider_version_number: nil,
+              provider_name: "Provider",
+              success: nil,
+              number: nil,
+              build_url: nil,
+              verification_executed_at: nil
+            }
+          end
+
+          let(:consumer_hash) do
+            {
+              name: 'Consumer',
+              _links: {
+                self: {
+                  href: 'http://example.org/pacticipants/Consumer'
+                }
+              },
+              version: {
+                number: '1.0.0',
+                _links: {
+                  self: {
+                    href: 'http://example.org/pacticipants/Consumer/versions/1.0.0'
+                  }
+                }
+              }
+            }
+          end
+
+          let(:provider_hash) do
+            {
+              name: 'Provider',
+              _links: {
+                self: {
+                  href: 'http://example.org/pacticipants/Provider'
+                }
+              },
+              version: {
+                number: '4.5.6'
+              }
+            }
+          end
+
+          let(:verification_hash) do
+            {
+              success: true,
+              verifiedAt: "2017-12-31T00:00:00+00:00",
+              _links: {
+                self: {
+                  href: "http://example.org/pacts/provider/Provider/consumer/Consumer/pact-version/1234/verification-results/1"
+                }
+              }
+            }
+          end
+
+          let(:pact_hash) do
+            {
+              createdAt: "2017-01-01T00:00:00+00:00",
+              _links: {
+                self: {
+                  href: "http://example.org/pacts/provider/Provider/consumer/Consumer/version/1.0.0"
+                }
+              }
+            }
+          end
+
+          let(:lines){ [line_1, line_2]}
+          let(:json) { MatrixPactDecorator.new(lines).to_json(user_options: { base_url: 'http://example.org' }) }
+          let(:parsed_json) { JSON.parse(json, symbolize_names: true) }
+
+          it "includes the consumer details" do
+            expect(parsed_json[:matrix][0][:consumer]).to eq consumer_hash
+          end
+
+          it "includes the provider details" do
+            expect(parsed_json[:matrix][0][:provider]).to eq provider_hash
+          end
+
+          it "includes the verification details" do
+            expect(parsed_json[:matrix][0][:verificationResult]).to eq verification_hash
+          end
+
+          it "includes the pact details" do
+            expect(parsed_json[:matrix][0][:pact]).to eq pact_hash
+          end
+
+          context "when the pact has not been verified" do
+            let(:verification_hash) do
+              nil
+            end
+
+            it "has empty provider details" do
+              expect(parsed_json[:matrix][1][:provider]).to eq provider_hash.merge(version: nil)
+            end
+
+            it "has a nil verificationResult" do
+              expect(parsed_json[:matrix][1][:verificationResult]).to eq verification_hash
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb

@@ -9,21 +9,15 @@ module PactBroker
           instance_double('PactBroker::Domain::Verification',
             number: 1,
             success: true,
-            provider_version: "4.5.6",
+            provider_version_number: "4.5.6",
             provider_name: 'Provider',
             consumer_name: 'Consumer',
             build_url: 'http://build-url',
-            pact_version: pact_version,
+            pact_version_sha: '1234',
             latest_pact_publication: pact_publication,
             execution_date: DateTime.now)
         end
 
-        let(:pact_version) do
-          instance_double('PactBroker::Pacts::PactVersion',
-            sha: '1234'
-          )
-        end
-
         let(:pact_publication) do
           instance_double('PactBroker::Pacts::PactPublication',
             name: 'A name',

data/spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb

@@ -12,16 +12,17 @@ module PactBroker
         let(:verification) do
           instance_double("PactBroker::Domain::Verification",
             success: true, number: 1,
-            provider_version: '4.5.6',
+            provider_version_number: '4.5.6',
             build_url: 'http://some-build',
             provider_name: 'Provider',
             consumer_name: 'Consumer',
             pact_version: pact_version,
+            pact_version_sha: '1234',
             latest_pact_publication: pact,
             execution_date: DateTime.now)
         end
         let(:pact_version) do
-          instance_double("PactBroker::Pacts::PactVersion", sha: '1234', name: 'Name')
+          instance_double("PactBroker::Pacts::PactVersion", name: 'Name')
         end
 
         let(:pact) { instance_double("PactBroker::Domain::Pact", name: "Some pact", consumer_name: "Foo", provider_name: "Bar", consumer_version_number: "1.2.3") }

data/spec/lib/pact_broker/api/resources/matrix_spec.rb

@@ -0,0 +1,38 @@
+require 'pact_broker/api/resources/matrix'
+require 'pact_broker/matrix/service'
+
+module PactBroker
+  module Api
+    module Resources
+      describe Matrix do
+        before do
+          allow(PactBroker::Matrix::Service).to receive(:validate_selectors).and_return(error_messages)
+        end
+
+        let(:td) { TestDataBuilder.new }
+        let(:path) { "/matrix" }
+        let(:json_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+        let(:params) { { selectors: ['Foo/version/1', 'Bar/version/2'] } }
+        let(:error_messages) { [] }
+
+        subject { get path, params, {'Content-Type' => 'application/hal+json'}; last_response }
+
+        it "validates the selectors" do
+          expect(PactBroker::Matrix::Service).to receive(:validate_selectors).with(['Foo/version/1', 'Bar/version/2'])
+          subject
+        end
+
+        context "when a validation error occurs" do
+          let(:error_messages) { ['foo'] }
+          it "returns a 400 status" do
+            expect(subject.status).to eq 400
+          end
+
+          it "returns error messages" do
+            expect(json_response_body[:errors]).to eq ['foo']
+          end
+        end
+      end
+    end
+  end
+end