pact_broker-client 1.25.1 → 1.27.4

data/script/trigger-release.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+output=$(curl -v -X POST https://api.github.com/repos/pact-foundation/pact_broker-client/dispatches \
+      -H 'Accept: application/vnd.github.everest-preview+json' \
+      -H "Authorization: Bearer $GITHUB_ACCESS_TOKEN" \
+      -d '{"event_type": "release-patch"}' 2>&1)
+
+echo "$output" | sed  "s/${GITHUB_ACCESS_TOKEN}/****/g"
+
+if  ! echo "${output}" | grep "HTTP\/1.1 204" > /dev/null; then
+  echo "$output" | sed  "s/${GITHUB_ACCESS_TOKEN}/****/g"
+  echo "Failed to do the thing"
+  exit 1
+fi
+

data/spec/integration/can_i_deploy_spec.rb

@@ -1,7 +1,7 @@
-describe "pact-broker can-i-deploy", skip_windows: true, skip_ci: true do
+describe "pact-broker can-i-deploy", skip_windows: true do
   before(:all) do
-    @pipe = IO.popen("bundle exec pact-stub-service spec/pacts/pact_broker_client-pact_broker.json -p 5000")
-    sleep 2
+    @pipe = IO.popen("bundle exec pact-stub-service spec/pacts/pact_broker_client-pact_broker.json -p 5000 --log tmp/pact-stub-can-i-deploy.log")
+    sleep 4
   end
 
   context "when the pacticipants can be deployed" do

data/spec/integration/create_version_tag_spec.rb

@@ -1,7 +1,6 @@
-# Currently failing on Travis, skip for now
-describe "pact-broker create-version-tag", skip_windows: true, skip_ci: true do
+describe "pact-broker create-version-tag", skip_windows: true do
   before(:all) do
-    @pipe = IO.popen("bundle exec pact-stub-service spec/pacts/pact_broker_client-pact_broker.json -p 5001")
+    @pipe = IO.popen("bundle exec pact-stub-service spec/pacts/pact_broker_client-pact_broker.json -p 5001 --log tmp/pact-stub-service-create-verison-tag.log")
     sleep 2
   end
 

data/spec/lib/pact_broker/client/can_i_deploy_spec.rb

@@ -9,11 +9,19 @@ module PactBroker
       let(:matrix_options) { {} }
       let(:pact_broker_client_options) { { foo: 'bar' } }
       let(:matrix_client) { instance_double('PactBroker::Client::Matrix') }
-      let(:matrix) { instance_double('Matrix::Resource', deployable?: true, reason: 'some reason', any_unknown?: any_unknown, supports_unknown_count?: supports_unknown_count) }
-      let(:any_unknown) { false }
+      let(:matrix) do
+        instance_double('Matrix::Resource',
+          deployable?: true,
+          reason: 'some reason',
+          any_unknown?: any_unknown,
+          supports_unknown_count?: supports_unknown_count,
+          unknown_count: unknown_count)
+      end
+      let(:unknown_count) { 0 }
+      let(:any_unknown) { unknown_count > 0 }
       let(:supports_unknown_count) { true }
       let(:retry_while_unknown) { 0 }
-      let(:options) { { output: 'text', retry_while_unknown: retry_while_unknown, retry_interval: 5} }
+      let(:options) { { output: 'text', retry_while_unknown: retry_while_unknown, retry_interval: 5 } }
 
 
       before do
@@ -76,7 +84,17 @@ module PactBroker
         end
 
         context "when any_unknown? is true" do
-          let(:any_unknown) { true }
+          before do
+            allow($stderr).to receive(:puts)
+            allow(Retry).to receive(:until_truthy_or_max_times)
+          end
+
+          let(:unknown_count) { 1 }
+
+          it "puts a message to stderr" do
+            expect($stderr).to receive(:puts).with("Waiting for 1 verification result to be published (maximum of 5 seconds)")
+            subject
+          end
 
           it "retries the request" do
             expect(Retry).to receive(:until_truthy_or_max_times).with(hash_including(times: 1, sleep: 5, sleep_first: true))

data/spec/lib/pact_broker/client/pacticipants/create_spec.rb

@@ -0,0 +1,28 @@
+require 'pact_broker/client/pacticipants/create'
+
+module PactBroker
+  module Client
+    module Pacticipants2
+      describe Create do
+        describe ".call" do
+          let(:pact_broker_client_options) { {} }
+          let(:broker_base_url) { "http://url" }
+          let(:params) { { name: 'Foo' } }
+
+          subject { Create.call(params, broker_base_url, pact_broker_client_options)}
+
+          context "when there is an http error" do
+            let!(:index_request) do
+              stub_request(:get, broker_base_url).to_return(status: 500, body: 'some error', headers: { "Content-Type" => "application/hal+json" }  )
+            end
+
+            it "returns a failure result" do
+              expect(subject.success).to be false
+              expect(subject.message).to include 'some error'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -192,7 +192,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Bversion%5D=4.5.6&latestby=cvpv"
       },
       "response": {
         "status": 200,
@@ -242,7 +242,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo%20Thing&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo%20Thing&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Bversion%5D=4.5.6&latestby=cvpv"
       },
       "response": {
         "status": 200,
@@ -292,7 +292,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&latestby=cvp&latest=true"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&latestby=cvp&latest=true"
       },
       "response": {
         "status": 200,
@@ -342,7 +342,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Bversion%5D=9.9.9&latestby=cvpv"
       },
       "response": {
         "status": 200,
@@ -366,7 +366,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Wiffle&q[][version]=1.2.3&q[][pacticipant]=Meep&q[][version]=9.9.9&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Wiffle&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Meep&q%5B%5D%5Bversion%5D=9.9.9&latestby=cvpv"
       },
       "response": {
         "status": 400,
@@ -394,7 +394,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][pacticipant]=Bar&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bpacticipant%5D=Bar&latestby=cvpv"
       },
       "response": {
         "status": 200,
@@ -463,7 +463,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][pacticipant]=Bar&latestby=cvpv&success[]=true"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bpacticipant%5D=Bar&latestby=cvpv&success%5B%5D=true"
       },
       "response": {
         "status": 200,
@@ -513,7 +513,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][latest]=true&q[][tag]=prod&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Blatest%5D=true&q%5B%5D%5Btag%5D=prod&latestby=cvpv"
       },
       "response": {
         "status": 200,
@@ -563,7 +563,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][version]=1.2.4&q[][pacticipant]=Bar&q[][latest]=true&latestby=cvpv"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.4&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Blatest%5D=true&latestby=cvpv"
       },
       "response": {
         "status": 200,
@@ -613,7 +613,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&latestby=cvp&latest=true&tag=prod"
+        "query": "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&latestby=cvp&latest=true&tag=prod"
       },
       "response": {
         "status": 200,
@@ -1249,6 +1249,161 @@
         }
       }
     },
+    {
+      "description": "a request for the index resource",
+      "providerState": "the pacticipant relations are present",
+      "request": {
+        "method": "get",
+        "path": "/",
+        "headers": {
+          "Accept": "application/hal+json"
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "_links": {
+            "pb:pacticipants": {
+              "href": "http://localhost:1234/pacticipants"
+            },
+            "pb:pacticipant": {
+              "href": "http://localhost:1234/pacticipants/{pacticipant}"
+            }
+          }
+        },
+        "matchingRules": {
+          "$.body._links.pb:pacticipants.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          },
+          "$.body._links.pb:pacticipant.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*\\{pacticipant\\}"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request to retrieve a pacticipant",
+      "request": {
+        "method": "get",
+        "path": "/pacticipants/Foo",
+        "headers": {
+          "Accept": "application/hal+json"
+        }
+      },
+      "response": {
+        "status": 404,
+        "headers": {
+        }
+      }
+    },
+    {
+      "description": "a request to create a pacticipant",
+      "request": {
+        "method": "post",
+        "path": "/pacticipants",
+        "headers": {
+          "Content-Type": "application/json",
+          "Accept": "application/hal+json"
+        },
+        "body": {
+          "name": "Foo",
+          "repositoryUrl": "http://foo"
+        }
+      },
+      "response": {
+        "status": 201,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "name": "Foo",
+          "repositoryUrl": "http://foo",
+          "_links": {
+            "self": {
+              "href": "http://localhost:1234/pacticipants/Foo"
+            }
+          }
+        },
+        "matchingRules": {
+          "$.body._links.self.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request to retrieve a pacticipant",
+      "providerState": "a pacticipant with name Foo exists",
+      "request": {
+        "method": "get",
+        "path": "/pacticipants/Foo",
+        "headers": {
+          "Accept": "application/hal+json"
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "_links": {
+            "self": {
+              "href": "http://localhost:1234/pacticipants/Foo"
+            }
+          }
+        },
+        "matchingRules": {
+          "$.body._links.self.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request to update a pacticipant",
+      "providerState": "a pacticipant with name Foo exists",
+      "request": {
+        "method": "patch",
+        "path": "/pacticipants/Foo",
+        "headers": {
+          "Content-Type": "application/json",
+          "Accept": "application/hal+json"
+        },
+        "body": {
+          "name": "Foo",
+          "repositoryUrl": "http://foo"
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "name": "Foo",
+          "repositoryUrl": "http://foo",
+          "_links": {
+            "self": {
+              "href": "http://localhost:1234/pacticipants/Foo"
+            }
+          }
+        },
+        "matchingRules": {
+          "$.body._links.self.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          }
+        }
+      }
+    },
     {
       "description": "a request to create a webhook with a JSON body for a consumer and provider",
       "providerState": "the 'Pricing Service' and 'Condor' already exist in the pact-broker",
@@ -1550,6 +1705,12 @@
           "_links": {
             "pb:webhooks": {
               "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-PB-WEBHOOKS"
+            },
+            "pb:pacticipants": {
+              "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-PB-PACTICIPANTS"
+            },
+            "pb:pacticipant": {
+              "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-PB-PACTICIPANT-{pacticipant}"
             }
           }
         },
@@ -1557,6 +1718,14 @@
           "$.body._links.pb:webhooks.href": {
             "match": "regex",
             "regex": "http:\\/\\/.*"
+          },
+          "$.body._links.pb:pacticipants.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          },
+          "$.body._links.pb:pacticipant.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*{pacticipant}"
           }
         }
       }

data/spec/service_providers/pact_broker_client_matrix_spec.rb

@@ -19,7 +19,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Bversion%5D=4.5.6&latestby=cvpv"
             ).
             will_respond_with(
               status: 200,
@@ -42,7 +42,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo%20Thing&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo%20Thing&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Bversion%5D=4.5.6&latestby=cvpv"
             ).
             will_respond_with(
               status: 200,
@@ -67,7 +67,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&latestby=cvp&latest=true"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&latestby=cvp&latest=true"
             ).
             will_respond_with(
               status: 200,
@@ -92,7 +92,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Bversion%5D=9.9.9&latestby=cvpv"
             ).
             will_respond_with(
               status: 200,
@@ -119,7 +119,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Wiffle&q[][version]=1.2.3&q[][pacticipant]=Meep&q[][version]=9.9.9&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Wiffle&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Meep&q%5B%5D%5Bversion%5D=9.9.9&latestby=cvpv"
             ).
             will_respond_with(
               status: 400,
@@ -147,7 +147,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][pacticipant]=Bar&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bpacticipant%5D=Bar&latestby=cvpv"
             ).
             will_respond_with(
               status: 200,
@@ -174,7 +174,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][pacticipant]=Bar&latestby=cvpv&success[]=true"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bpacticipant%5D=Bar&latestby=cvpv&success%5B%5D=true"
             ).
             will_respond_with(
               status: 200,
@@ -200,7 +200,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][latest]=true&q[][tag]=prod&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Blatest%5D=true&q%5B%5D%5Btag%5D=prod&latestby=cvpv"
             ).
             will_respond_with(
               status: 200,
@@ -226,7 +226,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][version]=1.2.4&q[][pacticipant]=Bar&q[][latest]=true&latestby=cvpv"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.4&q%5B%5D%5Bpacticipant%5D=Bar&q%5B%5D%5Blatest%5D=true&latestby=cvpv"
             ).
             will_respond_with(
               status: 200,
@@ -252,7 +252,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&latestby=cvp&latest=true&tag=prod"
+              query: "q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1.2.3&latestby=cvp&latest=true&tag=prod"
             ).
             will_respond_with(
               status: 200,