pact_broker 2.40.0 → 2.41.0

data/public/stylesheets/index.css

@@ -142,3 +142,16 @@ div.getting-started {
 td.to-be-deleted {
   background-color: #f2dede !important
 }
+
+div.pagination {
+  width: 100%;
+  text-align: center;
+}
+
+nav.paginationjs {
+  display: inline-block;
+}
+
+div.pagination div.nav-footer {
+  color: gray;
+}

data/public/stylesheets/matrix.css

@@ -18,4 +18,13 @@ div.tag-parent {
 
 div.tag {
   display: inline-block;
-}
+}
+
+span.pre-verified-icon {
+  color: #337ab7;
+}
+
+/* Need to make the tooltip wide enough to show the full SHA */
+td.pact-published .tooltip-inner {
+  max-width: 300px;
+}

data/spec/features/get_provider_pacts_for_verification_spec.rb

@@ -1,7 +1,13 @@
 describe "Get provider pacts for verification" do
   let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
   let(:pacts) { last_response_body[:_embedded][:'pacts'] }
-  subject { get path; last_response }
+  let(:query) do
+    {
+      consumer_version_selectors: [ { tag: "prod", latest: "true" }]
+    }
+  end
+
+  subject { get(path, query) }
 
   context "when the provider exists" do
     before do
@@ -16,24 +22,53 @@ describe "Get provider pacts for verification" do
         .create_pact
     end
 
-    context "with no tag specified" do
-      let(:path) { "/pacts/provider/Provider/for-verification" }
+    let(:path) { "/pacts/provider/Provider/for-verification" }
 
+    context "when using GET" do
       it "returns a 200 HAL JSON response" do
         expect(subject).to be_a_hal_json_success_response
       end
 
       it "returns a list of links to the pacts" do
-        expect(pacts.size).to eq 2
+        expect(pacts.size).to eq 1
+      end
+
+      context "when the provider does not exist" do
+        let(:path) { "/pacts/provider/ProviderThatDoesNotExist/for-verification" }
+
+        it "returns a 404 response" do
+          expect(subject).to be_a_404_response
+        end
       end
     end
-  end
 
-  context "when the provider does not exist" do
-    let(:path) { "/pacts/provider/Provider" }
+    context "when using POST" do
+      let(:request_body) do
+        {
+          consumerVersionSelectors: [ { tag: "prod", latest: true }]
+        }
+      end
 
-    it "returns a 404 response" do
-      expect(subject).to be_a_404_response
+      let(:request_headers) do
+        {
+          'CONTENT_TYPE' => 'application/json',
+          'HTTP_ACCEPT' => 'application/hal+json'
+        }
+      end
+
+      subject { post(path, request_body.to_json, request_headers) }
+
+      it "returns a list of links to the pacts" do
+        expect(pacts.size).to eq 1
+      end
+
+      context "when the provider does not exist" do
+        let(:path) { "/pacts/provider/ProviderThatDoesNotExist/for-verification" }
+
+        it "returns a 404 response" do
+          expect(subject).to be_a_404_response
+        end
+      end
     end
   end
 end

data/spec/features/pending_pacts_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe "the pending lifecycle of a pact (with no tags)" do
   end
 
   def get_pacts_for_verification
-    get("/pacts/provider/Bar/for-verification", nil, request_headers)
+    post("/pacts/provider/Bar/for-verification", { includePendingStatus: true }.to_json, request_headers)
   end
 
   def pact_url_from(pacts_for_verification_response)

data/spec/features/wip_pacts_spec.rb

@@ -0,0 +1,138 @@
+RSpec.describe "the lifecycle of a WIP pact" do
+  let(:pact_content_1) { { interactions: [{ some: 'interaction'}] }.to_json }
+  let(:pact_content_2) { { interactions: [{ some: 'other interaction'}] }.to_json }
+  let(:request_headers) { { "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/hal+json"} }
+  let(:provider_version_number) { "2" }
+  let(:failed_verification_results) do
+    {
+      providerApplicationVersion: provider_version_number,
+      success: false
+    }.to_json
+  end
+  let(:successful_verification_results) do
+    {
+      providerApplicationVersion: provider_version_number,
+      success: true
+    }.to_json
+  end
+  let(:pacts_for_verification_request_body) do
+    {
+      consumerVersionSelectors: [ { tag: "master", latest: true } ],
+      providerVersionTags: ["master"],
+      includeWipPactsSince: start_date
+    }.to_json
+  end
+  let(:start_date) { (Date.today - 1).to_datetime }
+
+  def publish_pact_with_master_tag
+    put("/pacts/provider/Bar/consumer/Foo/version/1", pact_content_1, request_headers)
+    put("/pacticipants/Foo/versions/1/tags/master", nil, request_headers)
+  end
+
+  def publish_pact_with_feature_tag
+    put("/pacts/provider/Bar/consumer/Foo/version/2", pact_content_2, request_headers)
+    put("/pacticipants/Foo/versions/2/tags/feat-x", nil, request_headers)
+  end
+
+  def get_pacts_for_verification
+    post("/pacts/provider/Bar/for-verification", pacts_for_verification_request_body, request_headers)
+  end
+
+  def wip_pact_url_from(pacts_for_verification_response)
+    wip_pacts_from(pacts_for_verification_response).first["_links"]["self"]["href"]
+  end
+
+  def get_pact(pact_url)
+    get pact_url, nil, request_headers
+  end
+
+  def verification_results_url_from(pact_response)
+    JSON.parse(pact_response.body)["_links"]["pb:publish-verification-results"]["href"]
+  end
+
+  def publish_verification_results_with_tag_master(verification_results_url, results)
+    post(verification_results_url, results, request_headers)
+    put("/pacticipants/Bar/versions/#{provider_version_number}/tags/master", nil, request_headers)
+  end
+
+  def pending_status_from(pacts_for_verification_response)
+    JSON.parse(pacts_for_verification_response.body)["_embedded"]["pacts"][0]["verificationProperties"]["pending"]
+  end
+
+  def wip_pacts_from(pacts_for_verification_response)
+    JSON.parse(pacts_for_verification_response.body)["_embedded"]["pacts"].select do | pact |
+      pact["verificationProperties"]["wip"]
+    end
+  end
+
+  context "when the includeWipPactsSince date is specified" do
+    context "a pact published afer the specified date, with a tag that is not specified explictly in the 'pacts for verification' request" do
+      describe "when it is first published" do
+        it "is included in the list of pacts to verify as a WIP pact" do
+          publish_pact_with_master_tag
+          publish_pact_with_feature_tag
+
+          pacts_for_verification_response = get_pacts_for_verification
+          expect(wip_pacts_from(pacts_for_verification_response).size).to eq 1
+        end
+      end
+
+      describe "when it is verified unsuccessfully" do
+        it "is still included as a WIP pact" do
+          # CONSUMER BUILD
+          # publish pact
+          publish_pact_with_master_tag
+          publish_pact_with_feature_tag
+
+          # PROVIDER BUILD
+          # fetch pacts to verify
+          pacts_for_verification_response = get_pacts_for_verification
+          pact_url = wip_pact_url_from(pacts_for_verification_response)
+          pact_response = get_pact(pact_url)
+
+          # verify pact... failure...
+
+          # publish failure verification results
+          verification_results_url = verification_results_url_from(pact_response)
+          publish_verification_results_with_tag_master(verification_results_url, failed_verification_results)
+
+          # ANOTHER PROVIDER BUILD
+          # get pacts for verification
+          pacts_for_verification_response = get_pacts_for_verification
+          # still pending
+          expect(wip_pacts_from(pacts_for_verification_response).size).to eq 1
+        end
+      end
+
+      describe "when it is verified successfully" do
+        it "is no longer included in the list of pacts to verify" do
+          # CONSUMER BUILD
+          publish_pact_with_master_tag
+          publish_pact_with_feature_tag
+
+          # PROVIDER BUILD
+          # fetch pacts to verify
+          pacts_for_verification_response = get_pacts_for_verification
+          pact_url = wip_pact_url_from(pacts_for_verification_response)
+          pact_response = get_pact(pact_url)
+
+          # verify pact... success!
+
+          # publish failure verification results
+          verification_results_url = verification_results_url_from(pact_response)
+          publish_verification_results_with_tag_master(verification_results_url, successful_verification_results)
+
+
+          # ANOTHER PROVIDER BUILD 2
+          # get pacts for verification
+          # publish successful verification results
+          pacts_for_verification_response = get_pacts_for_verification
+          # not wip any more
+          expect(wip_pacts_from(pacts_for_verification_response).size).to eq 0
+        end
+      end
+
+  end
+
+  end
+end

data/spec/integration/app_spec.rb

@@ -29,7 +29,7 @@ module PactBroker
     context "when Accept includes text/html" do
       let(:env) { {'HTTP_ACCEPT' => 'text/html'} }
 
-      subject { get path, '', env; last_response }
+      subject { get(path, '', env) }
 
       describe "a request for root" do
         let(:path) { '/' }

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

@@ -0,0 +1,90 @@
+require 'pact_broker/api/contracts/verifiable_pacts_json_query_schema'
+
+module PactBroker
+  module Api
+    module Contracts
+      describe VerifiablePactsJSONQuerySchema do
+        let(:params) do
+          {
+            providerVersionTags: provider_version_tags,
+            consumerVersionSelectors: consumer_version_selectors
+          }
+        end
+
+        let(:provider_version_tags) { %w[master] }
+
+        let(:consumer_version_selectors) do
+          [{
+            tag: "master",
+            latest: true
+          }]
+        end
+
+        subject { VerifiablePactsJSONQuerySchema.(params) }
+
+        context "when the params are valid" do
+          it "has no errors" do
+            expect(subject).to eq({})
+          end
+        end
+
+        context "when providerVersionTags is not an array" do
+          let(:provider_version_tags) { true }
+
+          it { is_expected.to have_key(:providerVersionTags) }
+        end
+
+        context "when consumerVersionSelectors is not an array" do
+          let(:consumer_version_selectors) { true }
+
+          it { is_expected.to have_key(:consumerVersionSelectors) }
+        end
+
+        context "when the consumer_version_selector is missing a tag" do
+          let(:consumer_version_selectors) do
+            [{}]
+          end
+
+          it "flattens the messages" do
+            expect(subject[:consumerVersionSelectors].first).to eq "tag is missing at index 0"
+          end
+        end
+
+        context "when the consumerVersionSelectors is missing the latest" do
+          let(:consumer_version_selectors) do
+            [{
+              tag: "master"
+            }]
+          end
+
+          it { is_expected.to have_key(:consumerVersionSelectors) }
+        end
+
+        context "when includeWipPactsSince key exists" do
+          let(:include_wip_pacts_since) { nil }
+          let(:params) do
+            {
+              includeWipPactsSince: include_wip_pacts_since
+            }
+          end
+
+          context "when it is nil" do
+            it { is_expected.to have_key(:includeWipPactsSince) }
+          end
+
+          context "when it is not a date" do
+            let(:include_wip_pacts_since) { "foo" }
+
+            it { is_expected.to have_key(:includeWipPactsSince) }
+          end
+
+          context "when it is a valid date" do
+            let(:include_wip_pacts_since) { "2013-02-13T20:04:45.000+11:00" }
+
+            it { is_expected.to_not have_key(:includeWipPactsSince) }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,6 @@ module PactBroker
   module Api
     module Contracts
       describe VerifiablePactsQuerySchema do
-
         let(:params) do
           {
             provider_version_tags: provider_version_tags,
@@ -45,15 +44,38 @@ module PactBroker
           end
         end
 
-        context "whne the consumer_version_selectors is missing the latest" do
+        context "when the consumer_version_selectors is missing the latest" do
           let(:consumer_version_selectors) do
             [{
               tag: "master"
             }]
           end
 
-          it "has no errors" do
-            expect(subject).to eq({})
+          it { is_expected.to have_key(:consumer_version_selectors) }
+        end
+
+        context "when include_wip_pacts_since key exists" do
+          let(:include_wip_pacts_since) { nil }
+          let(:params) do
+            {
+              include_wip_pacts_since: include_wip_pacts_since
+            }
+          end
+
+          context "when it is nil" do
+            it { is_expected.to have_key(:include_wip_pacts_since) }
+          end
+
+          context "when it is not a date" do
+            let(:include_wip_pacts_since) { "foo" }
+
+            it { is_expected.to have_key(:include_wip_pacts_since) }
+          end
+
+          context "when it is a valid date" do
+            let(:include_wip_pacts_since) { "2013-02-13T20:04:45.000+11:00" }
+
+            it { is_expected.to_not have_key(:include_wip_pacts_since) }
           end
         end
       end

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

@@ -16,6 +16,8 @@ module PactBroker
               {
                 consumer_name: "Consumer",
                 consumer_version_number: "1.0.0",
+                consumer_version_tags: consumer_version_tags,
+                provider_version_tags: provider_version_tags,
                 pact_version_sha: "1234",
                 pact_created_at: pact_created_at,
                 provider_version_number: "4.5.6",
@@ -33,6 +35,7 @@ module PactBroker
               {
                 consumer_name: "Consumer",
                 consumer_version_number: "1.0.0",
+                consumer_version_tags: [],
                 pact_version_sha: "1234",
                 pact_created_at: pact_created_at,
                 provider_version_number: nil,
@@ -59,7 +62,14 @@ module PactBroker
                   self: {
                     href: 'http://example.org/pacticipants/Consumer/versions/1.0.0'
                   }
-                }
+                },
+                tags: [
+                  {
+                    name: 'prod',
+                    latest: true
+
+                  }
+                ]
               }
             }
           end
@@ -73,7 +83,19 @@ module PactBroker
                 }
               },
               version: {
-                number: '4.5.6'
+                number: '4.5.6',
+                _links: {
+                  self: {
+                    href: 'http://example.org/pacticipants/Provider/versions/4.5.6'
+                  }
+                },
+                tags: [
+                  {
+                    name: 'master',
+                    latest: false
+                  }
+                ]
+
               }
             }
           end
@@ -101,6 +123,18 @@ module PactBroker
             }
           end
 
+          let(:consumer_version_tags) do
+            [
+              double('tag', name: 'prod', latest?: true)
+            ]
+          end
+
+          let(:provider_version_tags) do
+            [
+              double('tag', name: 'master', latest?: false)
+            ]
+          end
+
           let(:query_results){ PactBroker::Matrix::QueryResultsWithDeploymentStatusSummary.new([row_1, row_2], selectors, options, resolved_selectors, integrations, deployment_status_summary)}
           let(:selectors) { nil }
           let(:integrations){ [] }