feat(can-i-deploy): use array of query params for matrix

aushm · Oct 27, 2017 · 314e2e2 · 314e2e2
1 parent 003e305
commit 314e2e2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/pact_broker/client/matrix.rb b/lib/pact_broker/client/matrix.rb
@@ -5,7 +5,7 @@ module Client
     class Matrix < BaseClient
       def get selectors
         query = convert_selector_hashes_to_params(selectors)
-        response = self.class.get("/matrix", query: query, headers: default_get_headers)
+        response = self.class.get("/matrix", query: {q: query}, headers: default_get_headers)
         $stdout.puts("DEBUG: Response headers #{response.headers}") if verbose?
         $stdout.puts("DEBUG: Response body #{response}") if verbose?
         response = handle_response(response) do
@@ -32,7 +32,7 @@ def handle_response response
       end
 
       def convert_selector_hashes_to_params(selectors)
-        selectors.collect{ |selector| ["pacticipant[]=#{encode_query_param(selector[:name])}&version[]=#{encode_query_param(selector[:version])}"] }.join("&")
+        selectors.collect{ |selector| {pacticipant: selector[:name], version: selector[:version]} }
       end
     end
   end

diff --git a/spec/pacts/pact_broker_client-pact_broker.json b/spec/pacts/pact_broker_client-pact_broker.json
@@ -204,7 +204,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "pacticipant[]=Foo&version[]=1.2.3&pacticipant[]=Bar&version[]=4.5.6"
+        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
       },
       "response": {
         "status": 200,
@@ -246,7 +246,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "pacticipant[]=Foo+Thing&version[]=1.2.3&pacticipant[]=Bar&version[]=4.5.6"
+        "query": "q[][pacticipant]=Foo%20Thing&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
       },
       "response": {
         "status": 200,
@@ -288,7 +288,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "pacticipant[]=Foo&version[]=1.2.3&pacticipant[]=Bar&version[]=9.9.9"
+        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9"
       },
       "response": {
         "status": 400,
@@ -308,7 +308,7 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "pacticipant[]=Foo&version[]=1.2.3&pacticipant[]=Bar&version[]=9.9.9"
+        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9"
       },
       "response": {
         "status": 400,

diff --git a/spec/service_providers/pact_broker_client_matrix_spec.rb b/spec/service_providers/pact_broker_client_matrix_spec.rb
@@ -19,7 +19,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "pacticipant[]=Foo&version[]=1.2.3&pacticipant[]=Bar&version[]=4.5.6"
+              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
             ).
             will_respond_with(
               status: 200,
@@ -42,7 +42,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "pacticipant[]=Foo+Thing&version[]=1.2.3&pacticipant[]=Bar&version[]=4.5.6"
+              query: "q[][pacticipant]=Foo%20Thing&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
             ).
             will_respond_with(
               status: 200,
@@ -87,7 +87,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "pacticipant[]=Foo&version[]=1.2.3&pacticipant[]=Bar&version[]=9.9.9"
+              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9"
             ).
             will_respond_with(
               status: 400,
@@ -114,7 +114,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: "pacticipant[]=Foo&version[]=1.2.3&pacticipant[]=Bar&version[]=9.9.9"
+              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9"
             ).
             will_respond_with(
               status: 400,