pact_broker 2.15.0 → 2.16.0

data/lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb

@@ -6,6 +6,7 @@ module PactBroker
 
       include PactBroker::Repositories::Helpers
 
+      # TODO rename this to LatestVerificationsByPactVersion
       class LatestVerificationsByConsumerVersion < PactBroker::Domain::Verification
         set_dataset(:latest_verifications)
       end

data/lib/pact_broker/verifications/repository.rb

@@ -47,16 +47,16 @@ module PactBroker
       # 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
+      def find_latest_verification_for consumer_name, provider_name, consumer_version_tag = nil
         query = LatestVerificationsByConsumerVersion
           .select_all_qualified
           .join(:all_pact_publications, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
           .provider(provider_name)
-        if tag == :untagged
+        if consumer_version_tag == :untagged
           query = query.untagged
-        elsif tag
-          query = query.tag(tag)
+        elsif consumer_version_tag
+          query = query.tag(consumer_version_tag)
         end
         query.reverse_order(
           Sequel[:all_pact_publications][:consumer_version_order],

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.15.0'
+  VERSION = '2.16.0'
 end

data/lib/pact_broker/versions/abbreviate_number.rb

@@ -0,0 +1,14 @@
+module PactBroker
+  module Versions
+    class AbbreviateNumber
+
+      def self.call version_number
+        if version_number
+          version_number.gsub(/[A-Za-z0-9]{40}/) do | val |
+            val[0..6]
+          end
+        end
+      end
+    end
+  end
+end

data/pact_broker.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'roar', '~> 1.1'
   gem.add_runtime_dependency 'reform', '~> 2.2'
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
-  gem.add_runtime_dependency 'sequel', '~> 4.23'
+  gem.add_runtime_dependency 'sequel', '~> 5.6'
   gem.add_runtime_dependency 'webmachine', '1.5.0'
   gem.add_runtime_dependency 'semver2', '~> 3.4.2'
   gem.add_runtime_dependency 'rack', '~>2.0'
@@ -34,13 +34,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'pact-support'
   gem.add_runtime_dependency 'padrino-core', '>= 0.14.3', '~> 0.14'
   gem.add_runtime_dependency 'sinatra', '>= 2.0.1'
-  gem.add_runtime_dependency 'haml', '~>4.0'
+  gem.add_runtime_dependency 'haml', '~>5.0'
   gem.add_runtime_dependency 'sucker_punch', '~>2.0'
   gem.add_runtime_dependency 'rack-protection', '~>2.0'
   gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
   gem.add_runtime_dependency 'table_print', '~> 1.5'
 
   gem.add_development_dependency 'pact', '~>1.14'
+  gem.add_development_dependency 'rspec-pact-matchers', '~>0.1'
   gem.add_development_dependency 'bundler-audit', '~>0.4'
   gem.add_development_dependency 'sqlite3', '~>1.3'
   gem.add_development_dependency 'pry-byebug'

data/public/javascripts/matrix.js

@@ -57,4 +57,9 @@ $(document).ready(function(){
       return n.attr('data-sort-value') || n.text();
     }
   });
+
+
+  $('[data-toggle="tooltip"]').each(function(index, el){
+    $(el).tooltip({container: $(el)});
+  });
 });

data/public/stylesheets/index.css

@@ -12,7 +12,7 @@
 }
 
 table#relationships {
-  table-layout: fixed;
+  /*table-layout: fixed;*/
 }
 
 table#relationships td,
@@ -76,9 +76,41 @@ span.pact:hover svg path, span.pact-matrix:hover svg path {
   stroke: #2a6496;
 }
 
+#navigation .container-fluid {
+  padding-left: 0px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+#navigation .container-fluid .navbar-brand {
+  padding: 0px;
+  display: flex;
+  align-items: center;
+}
+
+#navigation .container-fluid:before {
+  content: '' !important;
+  display: none;
+}
+
+#navigation .container-fluid:after {
+  content: '' !important;
+  display: none;
+}
+
 #top-left-menu li a{
   padding-left: 10px
 }
 #top-left-menu li{
   list-style: none;
 }
+
+table#relationships .label {
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+div.tag {
+  display: inline-block;
+}

data/public/stylesheets/matrix.css

@@ -10,3 +10,12 @@ input[type="radio"] {
 div.top-of-group {
   margin-top: 10px;
 }
+
+div.tag-parent {
+  margin-top: 5px;
+  margin-bottom: 1px;
+}
+
+div.tag {
+  display: inline-block;
+}

data/script/db-spec.sh

@@ -9,6 +9,6 @@ bundle exec appraisal install
 set +e
 bundle exec rake
 rake_exit_code=$?
-if [[ $rake_exit_code -ne 0 && -n "$TRAVIS" ]]; then
+if [ $rake_exit_code -ne 0 ] && [ -n "$TRAVIS" ]; then
   cat log/pact_broker.log
 fi

data/spec/features/get_dashboard_spec.rb

@@ -0,0 +1,29 @@
+describe "Get dashboard" do
+
+  let(:path) { "/dashboard" }
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  before do
+    TestDataBuilder.new
+      .create_consumer("Foo")
+      .create_provider("Bar")
+      .create_consumer_version("1.2.3")
+      .create_consumer_version_tag("prod")
+      .create_pact
+      .create_verification(provider_version: "4.5.6", tag_names: "dev")
+      .create_webhook
+      .create_triggered_webhook
+      .create_webhook_execution
+  end
+
+  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 a list of items" do
+    items = JSON.parse(subject.body)['items']
+    expect(items).to be_instance_of(Array)
+  end
+end

data/spec/fixtures/dashboard.json

@@ -0,0 +1,83 @@
+{
+  "items": [
+    {
+      "_links": {
+        "pb:webhook-status": {
+          "href": "webhooks_status_url",
+          "title": "Status of webhooks for Foo/Bar pact"
+        }
+      },
+      "consumer": {
+        "_links": {
+          "self": {
+            "href": "consumer_url"
+          }
+        },
+        "name": "Foo",
+        "version": {
+          "_links": {
+            "self": {
+              "href": "consumer_version_url"
+            }
+          },
+          "number": "1"
+        }
+      },
+      "latestVerificationResult": {
+        "_links": {
+          "self": {
+            "href": "verification_url"
+          }
+        },
+        "success": true,
+        "verifiedAt": "2018-01-01T00:00:00+00:00"
+      },
+      "latestWebhookExecution": {
+        "triggeredAt": "2018-01-01T00:00:00+00:00"
+      },
+      "pactTags": [
+        {
+          "name": "prod",
+          "latest": true,
+          "_links": {
+            "self": {
+              "href": "pact_prod_tag_url"
+            }
+          }
+        }
+      ],
+      "latestVerificationResultTags": [
+        {
+          "name": "dev",
+          "latest": true,
+          "_links": {
+            "self": {
+              "href": "verification_dev_tag_url"
+            }
+          }
+        }
+      ],
+      "pact": {
+        "_links": {
+          "self": {
+            "href": "pact_url"
+          }
+        },
+        "createdAt": "2018-01-01T00:00:00+00:00"
+      },
+      "provider": {
+        "_links": {
+          "self": {
+            "href": "provider_url"
+          }
+        },
+        "name": "Bar",
+        "version": {
+          "number": "2"
+        }
+      },
+      "verificationStatus": "wiffle",
+      "webhookStatus": "blah"
+    }
+  ]
+}

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

@@ -0,0 +1,89 @@
+require 'pact_broker/api/decorators/dashboard_decorator'
+require 'pact_broker/domain/index_item'
+
+module PactBroker
+  module Api
+    module Decorators
+      describe DashboardDecorator do
+        let(:index_item) do
+          instance_double('PactBroker::Domain::IndexItem',
+            consumer: consumer,
+            provider: provider,
+            consumer_name: consumer.name,
+            provider_name: provider.name,
+            latest_pact: pact,
+            latest_verification: verification,
+            provider_version: provider_version,
+            consumer_version: consumer_version,
+            last_webhook_execution_date: last_webhook_execution_date,
+            webhook_status: 'blah',
+            verification_status: 'wiffle',
+            provider_version_number: provider_version.number,
+            consumer_version_number: consumer_version.number,
+            tag_names: ['prod'],
+            latest_verification_latest_tags: [double('tag', name: 'dev', latest?: true)]
+          )
+        end
+        let(:consumer) { instance_double('PactBroker::Domain::Pacticipant', name: 'Foo') }
+        let(:provider) { instance_double('PactBroker::Domain::Pacticipant', name: 'Bar') }
+        let(:pact) { instance_double('PactBroker::Domain::Pact', created_at: DateTime.new(2018)) }
+        let(:verification) { instance_double('PactBroker::Domain::Verification', success: true, created_at: DateTime.new(2018)) }
+        let(:consumer_version) { instance_double('PactBroker::Domain::Version', number: '1', pacticipant: consumer) }
+        let(:provider_version) { instance_double('PactBroker::Domain::Version', number: '2', pacticipant: provider) }
+        let(:last_webhook_execution_date) { Date.new(2018) }
+        let(:base_url) { 'http://example.org' }
+        let(:options) { { user_options: { base_url: base_url } } }
+        let(:dashboard_json) { DashboardDecorator.new([index_item]).to_json(options) }
+
+        before do
+          allow_any_instance_of(DashboardDecorator).to receive(:pact_url).with(base_url, pact).and_return('pact_url')
+          allow_any_instance_of(DashboardDecorator).to receive(:verification_url).with(verification, base_url).and_return('verification_url')
+          allow_any_instance_of(DashboardDecorator).to receive(:pacticipant_url).with(base_url, consumer).and_return('consumer_url')
+          allow_any_instance_of(DashboardDecorator).to receive(:pacticipant_url).with(base_url, provider).and_return('provider_url')
+          allow_any_instance_of(DashboardDecorator).to receive(:version_url).with(base_url, consumer_version).and_return('consumer_version_url')
+          allow_any_instance_of(DashboardDecorator).to receive(:webhooks_status_url).with(consumer, provider, base_url).and_return('webhooks_status_url')
+          allow_any_instance_of(DashboardDecorator).to receive(:tag_url) do | instance, base_url, tag |
+            if tag.version == consumer_version
+              expect(tag.name).to eq 'prod'
+              expect(tag.version).to be consumer_version
+              expect(base_url).to eq base_url
+              'pact_prod_tag_url'
+            else
+              expect(tag.name).to eq 'dev'
+              expect(tag.version).to be provider_version
+              expect(base_url).to eq base_url
+              'verification_dev_tag_url'
+            end
+          end
+        end
+
+        let(:expected_hash) { JSON.parse(File.read('spec/fixtures/dashboard.json')) }
+
+        subject { JSON.parse(dashboard_json) }
+
+        it "creates some json" do
+          expect(subject).to match_pact(expected_hash, {allow_unexpected_keys: false})
+        end
+
+        context "when the pact has never been verified" do
+          let(:verification) { nil }
+
+          it "has a null last verification and provider version" do
+            expected_hash['items'][0]['latestVerificationResult'] = nil
+            expected_hash['items'][0]['provider']['version'] = nil
+            expect(subject).to match_pact(expected_hash, {allow_unexpected_keys: false})
+          end
+        end
+
+        context "when no webhooks have been executed" do
+          let(:last_webhook_execution_date) { nil }
+
+          it "has a null latestWebhookExecution" do
+            expected_hash['items'][0]['latestWebhookExecution'] = nil
+            expect(subject).to match_pact(expected_hash, {allow_unexpected_keys: false})
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,33 +10,37 @@ module PactBroker
           let(:line_1_success) { true }
           let(:line_2_success) { true }
           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: line_1_success,
-              verification_number: 1,
-              verification_build_url: nil,
-              verification_executed_at: verification_date
-            }
+            double('PactBroker::Matrix::Row',
+              {
+                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: line_1_success,
+                verification_number: 1,
+                verification_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: line_2_success,
-              verification_number: nil,
-              verification_build_url: nil,
-              verification_executed_at: verification_date
-            }
+            double('PactBroker::Matrix::Row',
+              {
+                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: line_2_success,
+                verification_number: nil,
+                verification_build_url: nil,
+                verification_executed_at: verification_date
+              }
+            )
           end
 
           let(:consumer_hash) do
@@ -122,8 +126,8 @@ module PactBroker
 
           context "when the pact has not been verified" do
             before do
-              line_2[:success] = nil
-              line_2[:verification_executed_at] = nil
+              allow(line_2).to receive(:success).and_return(nil)
+              allow(line_2).to receive(:verification_executed_at).and_return(nil)
             end
 
             let(:verification_hash) { nil }

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

@@ -0,0 +1,16 @@
+require 'pact_broker/api/resources/dashboard'
+
+module PactBroker
+  module Api
+    module Resources
+
+      describe Dashboard do
+
+        let(:path) { "/dashboard" }
+        subject { get path; last_response }
+
+
+      end
+    end
+  end
+end