pact_broker 2.86.0 → 2.87.0

data/lib/pact_broker/webhooks/pact_and_verification_parameters.rb

@@ -7,6 +7,7 @@ module PactBroker
       PROVIDER_VERSION_NUMBER = "pactbroker.providerVersionNumber"
       PROVIDER_VERSION_TAGS = "pactbroker.providerVersionTags"
       PROVIDER_VERSION_BRANCH = "pactbroker.providerVersionBranch"
+      PROVIDER_VERSION_DESCRIPTIONS = "pactbroker.providerVersionDescriptions"
       CONSUMER_VERSION_TAGS = "pactbroker.consumerVersionTags"
       CONSUMER_VERSION_BRANCH = "pactbroker.consumerVersionBranch"
       CONSUMER_NAME = "pactbroker.consumerName"
@@ -17,6 +18,7 @@ module PactBroker
       GITLAB_VERIFICATION_STATUS = "pactbroker.gitlabVerificationStatus"
       CONSUMER_LABELS = "pactbroker.consumerLabels"
       PROVIDER_LABELS = "pactbroker.providerLabels"
+      BUILD_URL = "pactbroker.buildUrl"
       EVENT_NAME = "pactbroker.eventName"
       CURRENTLY_DEPLOYED_PROVIDER_VERSION_NUMBER = "pactbroker.currentlyDeployedProviderVersionNumber"
 
@@ -26,6 +28,7 @@ module PactBroker
         CONSUMER_VERSION_NUMBER,
         PROVIDER_VERSION_NUMBER,
         PROVIDER_VERSION_TAGS,
+        PROVIDER_VERSION_DESCRIPTIONS,
         PROVIDER_VERSION_BRANCH,
         CONSUMER_VERSION_TAGS,
         CONSUMER_VERSION_BRANCH,
@@ -38,6 +41,7 @@ module PactBroker
         CONSUMER_LABELS,
         PROVIDER_LABELS,
         EVENT_NAME,
+        BUILD_URL,
         CURRENTLY_DEPLOYED_PROVIDER_VERSION_NUMBER
       ]
 
@@ -57,6 +61,7 @@ module PactBroker
           PROVIDER_VERSION_NUMBER => provider_version_number,
           PROVIDER_VERSION_TAGS => provider_version_tags,
           PROVIDER_VERSION_BRANCH => provider_version_branch,
+          PROVIDER_VERSION_DESCRIPTIONS => provider_version_descriptions,
           CONSUMER_VERSION_TAGS => consumer_version_tags,
           CONSUMER_VERSION_BRANCH => consumer_version_branch,
           CONSUMER_NAME => pact ? pact.consumer_name : "",
@@ -68,6 +73,7 @@ module PactBroker
           CONSUMER_LABELS => pacticipant_labels(pact && pact.consumer),
           PROVIDER_LABELS => pacticipant_labels(pact && pact.provider),
           EVENT_NAME => event_name,
+          BUILD_URL => build_url,
           CURRENTLY_DEPLOYED_PROVIDER_VERSION_NUMBER => currently_deployed_provider_version_number
         }
       end
@@ -137,10 +143,10 @@ module PactBroker
       end
 
       def consumer_version_branch
-        if webhook_context[:consumer_version_branch]
-          webhook_context[:consumer_version_branch]
+        if webhook_context.key?(:consumer_version_branch)
+          webhook_context[:consumer_version_branch] || ""
         else
-          pact&.consumer_version&.branch || ""
+          pact&.consumer_version&.branch_names&.last || ""
         end
       end
 
@@ -172,6 +178,10 @@ module PactBroker
         end
       end
 
+      def provider_version_descriptions
+        webhook_context[:provider_version_descriptions]&.join(", ") || ""
+      end
+
       def pacticipant_labels pacticipant
         pacticipant && pacticipant.labels ? pacticipant.labels.collect(&:name).join(", ") : ""
       end
@@ -180,6 +190,10 @@ module PactBroker
         webhook_context.fetch(:event_name)
       end
 
+      def build_url
+        webhook_context[:build_url] || ""
+      end
+
       def currently_deployed_provider_version_number
         webhook_context[:currently_deployed_provider_version_number] || ""
       end

data/lib/pact_broker/webhooks/trigger_service.rb

@@ -135,7 +135,7 @@ module PactBroker
           required_verifications = verification_service.calculate_required_verifications_for_pact(pact)
           event_contexts.flat_map do | event_context |
             required_verifications.collect do | required_verification |
-              event_context.merge(provider_version_number: required_verification.provider_version.number, provider_version_descriptions: required_verification.provider_version_descriptions)
+              event_context.merge(provider_version_number: required_verification.provider_version.number, provider_version_descriptions: required_verification.provider_version_descriptions.uniq)
             end
           end
         else

data/lib/pact_broker/webhooks/webhook.rb

@@ -204,9 +204,14 @@ end
 #  enabled              | boolean                     | DEFAULT true
 #  description          | text                        |
 #  headers              | text                        |
+#  consumer_label       | text                        |
+#  provider_label       | text                        |
 # Indexes:
 #  webhooks_pkey   | PRIMARY KEY btree (id)
 #  uq_webhook_uuid | UNIQUE btree (uuid)
+# Check constraints:
+#  consumer_label_exclusion | (consumer_id IS NULL OR consumer_id IS NOT NULL AND consumer_label IS NULL)
+#  provider_label_exclusion | (provider_id IS NULL OR provider_id IS NOT NULL AND provider_label IS NULL)
 # Foreign key constraints:
 #  fk_webhooks_consumer | (consumer_id) REFERENCES pacticipants(id)
 #  fk_webhooks_provider | (provider_id) REFERENCES pacticipants(id)

data/public/stylesheets/index.css

@@ -241,3 +241,8 @@ span.copy-success-icon {
 div.top-of-group {
   margin-top: 20px;
 }
+
+
+div[data-toggle="tooltip"] {
+  cursor: pointer;
+}

data/script/data/auto-create-things-for-tags.rb

@@ -13,6 +13,7 @@ begin
     .deploy_to_prod(pacticipant: "AutoDetectTestProvider", version: "1")
     .publish_pact(consumer: "AutoDetectTestConsumer", provider: "AutoDetectTestProvider", consumer_version: "1", tag: "feat/x", content_id: "2111")
     .publish_pact(consumer: "AutoDetectTestConsumer", provider: "AutoDetectTestProvider", consumer_version: "2", tag: "feat/y", content_id: "21asdfd")
+    .deploy_to_prod(pacticipant: "AutoDetectTestConsumer", version: "1")
 
 rescue StandardError => e
   puts "#{e.class} #{e.message}"

data/script/data/contract-published-requiring-verification.rb

@@ -14,7 +14,6 @@ begin
     .create_pacticipant("NewWebhookTestConsumer")
     .create_pacticipant("NewWebhookTestProvider")
     .create_tagged_pacticipant_version(pacticipant: "NewWebhookTestProvider", version: "1", tag: "main")
-    .deploy_to_prod(pacticipant: "NewWebhookTestProvider", version: "1")
     .record_deployment(pacticipant: "NewWebhookTestProvider", version: "1", environment_name: "test")
     .record_deployment(pacticipant: "NewWebhookTestProvider", version: "1", environment_name: "prod")
     .create_version(pacticipant: "NewWebhookTestProvider", version: "2", branch: "main")

data/spec/fixtures/invalid-publish-contract-body.json

@@ -0,0 +1,38 @@
+{
+    "contracts":
+    [
+        {
+            "consumer":
+            {
+                "name": "foo"
+            },
+            "interactions":
+            [
+                {
+                    "description": "a request",
+                    "providerState": "some state",
+                    "request":
+                    {
+                        "method": "post",
+                        "path": "/path"
+                    },
+                    "response":
+                    {
+                        "status": 200
+                    }
+                }
+            ],
+            "metadata":
+            {
+                "pactSpecification":
+                {
+                    "version": "2.0.0"
+                }
+            },
+            "provider":
+            {
+                "name": "provider"
+            }
+        }
+    ]
+}

data/spec/integration/webhooks/contract_publication_spec.rb

@@ -0,0 +1,68 @@
+RSpec.describe "triggering a webhook for a contract publication" do
+  before do
+    td.create_global_webhook(event_names: ["contract_published"], body: webhook_body_template)
+  end
+
+  let(:webhook_body_template) do
+    {
+      "consumer_version_number" => "${pactbroker.consumerVersionNumber}",
+      "consumer_version_branch" => "${pactbroker.consumerVersionBranch}",
+      "build_url" => "${pactbroker.buildUrl}",
+      "consumer_version_tags" => "${pactbroker.consumerVersionTags}",
+    }
+  end
+
+  let(:expected_webhook_body) do
+    {
+      consumer_version_number: "1",
+      consumer_version_branch: "main",
+      consumer_version_tags: "a, b",
+      build_url: "http://ci/builds/1234"
+    }
+  end
+
+  let(:request_body_hash) do
+    {
+      :pacticipantName => "Foo",
+      :pacticipantVersionNumber => "1",
+      :branch => "main",
+      :tags => ["a", "b"],
+      :buildUrl => "http://ci/builds/1234",
+      :contracts => [
+        {
+          :consumerName => "Foo",
+          :providerName => "Bar",
+          :specification => "pact",
+          :contentType => "application/json",
+          :content => encoded_contract
+        }
+      ]
+    }
+  end
+
+  let(:rack_headers) do
+    {
+      "CONTENT_TYPE" => "application/json",
+      "HTTP_ACCEPT" => "application/hal+json",
+      "pactbroker.database_connector" => database_connector}
+  end
+
+  let(:contract) { { consumer: { name: "Foo" }, provider: { name: "Bar" }, interactions: [] }.to_json }
+  let(:encoded_contract) { Base64.strict_encode64(contract) }
+  let(:path) { "/contracts/publish" }
+
+  let!(:request) do
+    stub_request(:post, /http/).to_return(:status => 200)
+  end
+
+  subject { post(path, request_body_hash.to_json, rack_headers) }
+
+  let(:database_connector) { ->(&block) { block.call } }
+
+  it { is_expected.to be_a_hal_json_success_response }
+
+  it "passes through the correct parameters to the webhook" do
+    subject
+    expect(a_request(:post, /http/).with(body: expected_webhook_body)).to have_been_made
+  end
+end

data/spec/integration/webhooks/contract_requiring_verification_published_spec.rb

@@ -0,0 +1,67 @@
+RSpec.describe "triggering a contract_requiring_verification_published webhook for a contract publication" do
+  before do
+    td.create_global_webhook(event_names: ["contract_requiring_verification_published"], body: webhook_body_template)
+      .create_environment("test")
+      .create_provider("Bar", main_branch: "main")
+      .create_provider_version("1", branch: "main")
+  end
+
+  let(:webhook_body_template) do
+    {
+      "provider_version_number" => "${pactbroker.providerVersionNumber}",
+      "provider_version_descriptions" => "${pactbroker.providerVersionDescriptions}"
+    }
+  end
+
+  let(:expected_webhook_body) do
+    {
+      provider_version_number: "1",
+      provider_version_descriptions: a_kind_of(String)
+    }
+  end
+
+  let(:request_body_hash) do
+    {
+      :pacticipantName => "Foo",
+      :pacticipantVersionNumber => "1",
+      :branch => "main",
+      :tags => ["a", "b"],
+      :buildUrl => "http://ci/builds/1234",
+      :contracts => [
+        {
+          :consumerName => "Foo",
+          :providerName => "Bar",
+          :specification => "pact",
+          :contentType => "application/json",
+          :content => encoded_contract
+        }
+      ]
+    }
+  end
+
+  let(:rack_headers) do
+    {
+      "CONTENT_TYPE" => "application/json",
+      "HTTP_ACCEPT" => "application/hal+json",
+      "pactbroker.database_connector" => database_connector}
+  end
+
+  let(:contract) { { consumer: { name: "Foo" }, provider: { name: "Bar" }, interactions: [] }.to_json }
+  let(:encoded_contract) { Base64.strict_encode64(contract) }
+  let(:path) { "/contracts/publish" }
+
+  let!(:request) do
+    stub_request(:post, /http/).to_return(:status => 200)
+  end
+
+  subject { post(path, request_body_hash.to_json, rack_headers) }
+
+  let(:database_connector) { ->(&block) { block.call } }
+
+  it { is_expected.to be_a_hal_json_success_response }
+
+  it "passes through the correct parameters to the webhook" do
+    subject
+    expect(a_request(:post, /http/).with(body: expected_webhook_body)).to have_been_made
+  end
+end

data/spec/integration/webhooks/pact_publication_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe "triggering a webhook for a pact publication" do
 
   let(:database_connector) { ->(&block) { block.call } }
 
-  subject { put("/pacts/provider/Bar/consumer/Foo/version/2", pact_content, { "CONTENT_TYPE" => "application/json", "pactbroker.database_connector" => database_connector}) }
+  subject { put("/pacts/provider/Bar/consumer/Foo/version/2", pact_content, { "CONTENT_TYPE" => "application/json", "pactbroker.database_connector" => database_connector }) }
 
   context "when there is a verification from the main branch of the provider" do
     before do

data/spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb

@@ -27,8 +27,8 @@ module Pact
             let(:consumer_contract) { Pact::ConsumerContract.from_uri "./spec/support/markdown_pact_with_markdown_chars_in_names.json" }
 
             it "escapes the markdown characters" do
-              expect(subject.call).to include '# A pact between Some\*Consumer\*App and Some\_Provider\_App'
-              expect(subject.call).to include '### Requests from Some\*Consumer\*App to Some\_Provider\_App'
+              expect(subject.call).to include "# A pact between Some\\*Consumer\\*App and Some\\_Provider\\_App"
+              expect(subject.call).to include "### Requests from Some\\*Consumer\\*App to Some\\_Provider\\_App"
             end
           end
 

data/spec/lib/pact_broker/api/contracts/publish_contracts_schema_spec.rb

@@ -108,6 +108,19 @@ module PactBroker
 
           its([:contracts, 0]) { is_expected.to include "provider name in contract content ('WRONG') must match providerName ('Bar') in contracts at index 0" }
         end
+
+        context "when the consumer name is missing and there is a validation error with the content" do
+          let(:params) do
+            JSON.parse(File.read("spec/fixtures/invalid-publish-contract-body.json"), symbolize_names: true)
+          end
+
+          it "handles multiple errors" do
+            expect(subject[:contracts]).to include "consumerName is missing at index 0"
+            expect(subject[:contracts]).to include "providerName is missing at index 0"
+            expect(subject[:contracts]).to include "contentType is missing at index 0"
+            expect(subject[:contracts]).to include "specification is missing at index 0"
+          end
+        end
       end
     end
   end

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

@@ -129,7 +129,7 @@ module PactBroker
               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"
+                  href: "http://example.org/pacts/provider/Provider/consumer/Consumer/pact-version/1234/metadata/Y3ZuPTEuMC4w/verification-results/1"
                 }
               }
             }

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

@@ -6,6 +6,7 @@ module PactBroker
       describe VerificationDecorator do
         before do
           allow_any_instance_of(VerificationDecorator).to receive(:verification_triggered_webhooks_url).and_return("http://triggered-webhooks")
+          allow_any_instance_of(VerificationDecorator).to receive(:pact_version_with_consumer_version_metadata_url).and_return("http://pact")
         end
 
         let(:verification) do
@@ -18,25 +19,25 @@ module PactBroker
             test_results: { "arbitrary" => "json" },
             build_url: "http://build-url",
             pact_version_sha: "1234",
-            latest_pact_publication: pact_publication,
             execution_date: DateTime.now,
             provider_version_tags: provider_version_tags,
             verified_by_implementation: "Ruby",
             verified_by_version: "1234")
         end
 
-        let(:pact_publication) do
-          instance_double("PactBroker::Pacts::PactPublication",
+        let(:pact) do
+          instance_double("PactBroker::Domain::Pact",
             name: "A name",
             provider_name: "Provider",
             consumer_name: "Consumer",
-            consumer_version_number: "1.2.3"
+            consumer_version_number: "1.2.3",
+            pact_version_sha: "1234",
           )
         end
 
         let(:provider_version_tags) { [instance_double(PactBroker::Tags::TagWithLatestFlag, name: "prod", latest?: true)] }
 
-        let(:options) { { user_options: { base_url: "http://example.org" } } }
+        let(:options) { { user_options: { base_url: "http://example.org", pact: pact } } }
 
         let(:json) { VerificationDecorator.new(verification).to_json(options) }
 
@@ -63,7 +64,7 @@ module PactBroker
         end
 
         it "includes a link to its pact" do
-          expect(subject[:_links][:'pb:pact-version'][:href]).to match %r{http://example.org/pacts/}
+          expect(subject[:_links][:'pb:pact-version'][:href]).to eq "http://pact"
         end
 
         it "includes a link to the triggered webhooks" do

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

@@ -31,7 +31,7 @@ module PactBroker
         end
 
         let(:provider_version_tags) { [instance_double(PactBroker::Tags::TagWithLatestFlag, name: "prod", latest?: true)] }
-        let(:pact) { instance_double("PactBroker::Domain::Pact", name: "Some pact", consumer_name: "Foo", provider_name: "Bar", consumer_version_number: "1.2.3") }
+        let(:pact) { instance_double("PactBroker::Domain::Pact", name: "Some pact", consumer_name: "Foo", provider_name: "Bar", consumer_version_number: "1.2.3", pact_version_sha: "1234") }
         let(:is_pending) { true }
         let(:options) { {base_url: "http://example.org", consumer_name: "Foo", consumer_version_number: "1.2.3", resource_url: "http://self"} }
 

data/spec/lib/pact_broker/api/pact_broker_urls_spec.rb

@@ -100,6 +100,24 @@ module PactBroker
         end
       end
 
+      describe "verification_url_from_params" do
+        context "with consumer_version_number" do
+          let(:params) do
+            {
+              consumer_name: consumer_name,
+              provider_name: provider_name,
+              pact_version_sha: "1234",
+              consumer_version_number: "2",
+              verification_number: "1"
+            }
+          end
+
+          subject { PactBrokerUrls.verification_url_from_params(params, base_url)}
+
+          it { is_expected.to eq "http://example.org/pacts/provider/Bar%2FBar/consumer/Foo%2FFoo/pact-version/1234/metadata/Y3ZuPTI/verification-results/1" }
+        end
+      end
+
       describe "templated_diff_url" do
         subject { PactBrokerUrls.templated_diff_url(pact, base_url) }
 

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

@@ -15,15 +15,16 @@ module PactBroker
             .create_webhook_execution(logs: "waffle")
         end
 
-        let(:path) { "/webhooks/5432/trigger/1234/logs" }
-
         subject { get(path) }
 
         let(:triggered_webhook_uuid) { PactBroker::Webhooks::TriggeredWebhook.first.uuid }
-        let(:path) { "/triggered-webhooks/#{triggered_webhook_uuid}/logs" }
 
-        it "returns the concatenated webhook execution logs" do
-          expect(subject.body).to eq "foo\nbar"
+        describe "by triggered webhook uuid" do
+          let(:path) { "/triggered-webhooks/1234/logs" }
+
+          it "returns the concatenated webhook execution logs" do
+            expect(subject.body).to eq "foo\nbar"
+          end
         end
       end
     end

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

@@ -38,6 +38,19 @@ module PactBroker
             end
           end
 
+          context "with pacticipant selectors to ignore" do
+            before do
+              params[:ignore] = [{ pacticipant: "foo" }, { pacticipant: "bar", version: "2" }]
+            end
+
+            its([:ignore_selectors]) do
+              is_expected.to eq [
+                PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: "foo"),
+                PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: "bar", pacticipant_version_number: "2")
+              ]
+            end
+          end
+
           context "with a tag" do
             let(:params) do
               {

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

@@ -15,14 +15,13 @@ module PactBroker
         subject { Repository.new.find_for_verification("Bar", consumer_version_selectors) }
 
         context "when there are no selectors" do
-
           let(:foo_main_branch) { nil }
 
           let(:consumer_version_selectors) { Selectors.new }
 
           context "when there is no main branch version" do
             before do
-              td.create_consumer("Foo")
+              td.create_consumer("Foo", main_branch: "main")
                 .create_pact_with_hierarchy("Foo", "foo-latest-prod-version", "Bar")
                 .create_consumer_version_tag("prod")
                 .create_consumer_version("not-latest-dev-version", tag_names: ["dev"])
@@ -31,14 +30,14 @@ module PactBroker
                 .create_consumer_version("foo-latest-dev-version", tag_names: ["dev"])
                 .create_pact
                 .create_consumer("Baz")
-                .create_consumer_version("baz-latest-dev-version", tag_names: ["dev"])
+                .create_consumer_version("baz-latest-dev-version", tag_names: ["dev", "main"])
                 .create_pact
             end
 
             it "returns the latest pact for each consumer" do
               expect(subject.size).to eq 2
-              expect(find_by_consumer_name_and_consumer_version_number("Foo", "foo-latest-dev-version")).to_not be nil
-              expect(find_by_consumer_name_and_consumer_version_number("Baz", "baz-latest-dev-version")).to_not be nil
+              expect(subject).to include(have_attributes(consumer_name: "Foo", consumer_version_number: "foo-latest-dev-version"))
+              expect(subject).to include(have_attributes(consumer_name: "Baz", consumer_version_number: "baz-latest-dev-version"))
               expect(subject.all?(&:overall_latest?)).to be true
             end
           end

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

@@ -26,7 +26,7 @@ module PactBroker
         its(:provider_name) { should eq "Provider Name"}
         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(:pact_matrix_url) { should eq "/matrix?q[][pacticipant]=Consumer+Name&q[][version]=1.2.3&q[][pacticipant]=Provider+Name&latestby=cvpv" }
         its(:consumer_group_url) { should eq "/pacticipants/Consumer%20Name" }
         its(:provider_group_url) { should eq "/pacticipants/Provider%20Name" }
 

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

@@ -115,7 +115,7 @@ module PactBroker
             expect(subject).to eq [
               RequiredVerification.new(
                 provider_version: td.find_version("Bar", "1"),
-                provider_version_descriptions: ["latest version from main branch"]
+                provider_version_descriptions: ["latest from main branch"]
               )
             ]
           end
@@ -153,7 +153,7 @@ module PactBroker
             expect(subject).to eq [
               RequiredVerification.new(
                 provider_version: td.find_version("Bar", "1"),
-                provider_version_descriptions: ["currently deployed version (test)"]
+                provider_version_descriptions: ["deployed in test"]
               )
             ]
           end
@@ -193,7 +193,7 @@ module PactBroker
             expect(subject).to eq [
               RequiredVerification.new(
                 provider_version: td.find_version("Bar", "1"),
-                provider_version_descriptions: ["currently released version (test)"]
+                provider_version_descriptions: ["released in test"]
               )
             ]
           end
@@ -235,9 +235,9 @@ module PactBroker
               RequiredVerification.new(
               provider_version: td.find_version("Bar", "1"),
               provider_version_descriptions: [
-                "latest version from main branch",
-                "currently deployed version (test)",
-                "currently released version (test)"
+                "latest from main branch",
+                "deployed in test",
+                "released in test"
               ])
             ]
           end

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

@@ -75,7 +75,7 @@ module PactBroker
         end
 
         let(:consumer_version) do
-          double("version", tags: consumer_tags, branch: "consumer-branch")
+          double("version", tags: consumer_tags, branch_names: ["foo-branch","consumer-branch"])
         end
 
         let(:provider_tags) do
@@ -94,7 +94,7 @@ module PactBroker
           [ double("label", name: "foo"), double("label", name: "bar") ]
         end
 
-        let(:webhook_context) { { base_url: base_url, event_name: "something" } }
+        let(:webhook_context) { { base_url: base_url, event_name: "something", build_url: "http://build"} }
 
         let(:nil_pact) { nil }
         let(:nil_verification) { nil }
@@ -140,6 +140,7 @@ module PactBroker
           ["${pactbroker.consumerVersionBranch}", "consumer-branch", :pact_with_successful_verification, :verification],
           ["${pactbroker.consumerLabels}", "foo, bar", :pact_with_successful_verification, :verification],
           ["${pactbroker.providerLabels}", "finance, IT", :pact, :nil_verification],
+          ["${pactbroker.buildUrl}", "http://build", :nil_pact, :nil_verification]
         ]
 
         TEST_CASES.each do | (template, expected_output, pact_var_name, verification_var_name) |

data/tasks/db.rake

@@ -95,7 +95,10 @@ namespace :db do
     PactBroker::Database.ensure_database_dir_exists
   end
 
-  desc "Annotate the Sequel domain classes with schema information - start the postgres db with script/docker/db-start.sh first"
+  desc "Annotate the Sequel domain classes with schema information.
+  Start the postgres db with script/docker/db-start.sh first and run
+  INSTALL_PG=true bundle exec rake db:annotate
+  "
   task :annotate do
     begin
       raise "Need to set INSTALL_PG=true" unless ENV["INSTALL_PG"] == "true"