pact_broker-client 1.8.0 → 1.9.0

data/spec/lib/pact_broker/client/cli/broker_publish_spec.rb

@@ -5,6 +5,7 @@ module PactBroker::Client::CLI
     describe ".broker" do
       before do
         allow(PactBroker::Client::PublishPacts).to receive(:call).and_return(true)
+        allow(PactBroker::Client::Git).to receive(:branch).and_return("bar")
         subject.options = OpenStruct.new(minimum_valid_options)
       end
 
@@ -79,6 +80,30 @@ module PactBroker::Client::CLI
         end
       end
 
+      context "with tag-with-git-branch" do
+        before do
+          subject.options = OpenStruct.new(
+            minimum_valid_options.merge(tag_with_git_branch: true)
+          )
+        end
+
+        it "determines the git branch name" do
+          expect(PactBroker::Client::Git).to receive(:branch)
+          invoke_broker
+        end
+
+        it "adds it to the list of tags when publishing" do
+          expect(PactBroker::Client::PublishPacts).to receive(:call).with(
+            anything,
+            anything,
+            anything,
+            ['bar'],
+            anything
+          )
+          invoke_broker
+        end
+      end
+
       context "with basic auth options specified" do
         before do
           subject.options = OpenStruct.new(

data/spec/lib/pact_broker/client/cli/version_selector_options_parser_spec.rb

@@ -7,26 +7,29 @@ module PactBroker
 
         TEST_CASES = [
           [
-            ["--name", "Foo", "--version", "1.2.3"],
-            [{ name: "Foo", version: "1.2.3" } ]
+            ["--pacticipant", "Foo", "--version", "1.2.3"],
+            [{ pacticipant: "Foo", version: "1.2.3" } ]
           ],[
-            ["-n", "Foo", "-a", "1.2.3"],
-            [{ name: "Foo", version: "1.2.3" } ]
+            ["-a", "Foo", "-e", "1.2.3"],
+            [{ pacticipant: "Foo", version: "1.2.3" } ]
           ],[
-            ["--name", "Foo"],
-            [{ name: "Foo" } ]
+            ["--pacticipant", "Foo"],
+            [{ pacticipant: "Foo" } ]
           ],[
-            ["--name", "Foo", "Bar"],
-            [{ name: "Bar" } ]
+            ["--pacticipant", "Foo", "Bar"],
+            [{ pacticipant: "Bar" } ]
           ],[
-            ["--name", "Foo", "--name", "Bar", "--version", "1.2.3"],
-            [{ name: "Foo" }, { name: "Bar", version: "1.2.3" } ]
+            ["--pacticipant", "Foo", "--pacticipant", "Bar", "--version", "1.2.3"],
+            [{ pacticipant: "Foo" }, { pacticipant: "Bar", version: "1.2.3" } ]
           ],[
-            ["--name", "Foo", "--wrong", "Bar", "--version", "1.2.3"],
-            [{ name: "Foo", version: "1.2.3" } ]
+            ["--pacticipant", "Foo", "--wrong", "Bar", "--version", "1.2.3"],
+            [{ pacticipant: "Foo", version: "1.2.3" } ]
           ],[
-            ["--name", "the-thing", "--version", "1.2.3"],
-            [{ name: "the-thing", version: "1.2.3" } ]
+            ["--pacticipant", "the-thing", "--version", "1.2.3"],
+            [{ pacticipant: "the-thing", version: "1.2.3" } ]
+          ],[
+            ["--version", "1.2.3"],
+            [{ pacticipant: nil, version: "1.2.3" } ]
           ]
         ]
 

data/spec/lib/pact_broker/client/matrix/text_formatter_spec.rb

@@ -3,12 +3,12 @@ require 'pact_broker/client/matrix/text_formatter'
 module PactBroker
   module Client
     describe Matrix::TextFormatter do
-      let(:matrix_lines) { JSON.parse(File.read('spec/support/matrix.json'), symbolize_names: true) }
+      let(:matrix_lines) { JSON.parse(File.read('spec/support/matrix.json'), symbolize_names: true)[:matrix] }
       let(:expected_matrix_lines) { File.read('spec/support/matrix.txt') }
 
       # SublimeText removes whitespace from the end of files when you save them,
       # so removing trailing whitespace before comparing
-      subject { Matrix::TextFormatter.call(matrix_lines).split("\n").collect(&:strip).join("\n") }
+      subject { Matrix::TextFormatter.call(matrix: matrix_lines).split("\n").collect(&:strip).join("\n") }
 
       context "with valid data" do
         it "it has the right text" do

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

@@ -3,8 +3,9 @@ require 'pact_broker/client/matrix'
 module PactBroker
   module Client
     describe Matrix do
+      let(:matrix) { Matrix.new(base_url: 'http://example.org') }
+
       context "when the matrix resource is not found because the broker is the wrong version" do
-        let(:matrix) { Matrix.new(base_url: 'http://example.org') }
         let!(:request) { stub_request(:get, /matrix/).to_return(status: 404) }
 
         it "raises a helpful error" do

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -18,17 +18,7 @@
       "response": {
         "status": 200,
         "headers": {
-          "Content-Type": {
-            "json_class": "Pact::Term",
-            "data": {
-              "generate": "application/hal+json",
-              "matcher": {
-                "json_class": "Regexp",
-                "o": 0,
-                "s": "application/hal\\+json"
-              }
-            }
-          }
+          "Content-Type": "application/hal+json"
         },
         "body": {
           "_links": {
@@ -73,6 +63,12 @@
               }
             }
           ]
+        },
+        "matchingRules": {
+          "$.headers.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/hal\\+json"
+          }
         }
       }
     },
@@ -88,17 +84,7 @@
       "response": {
         "status": 200,
         "headers": {
-          "Content-Type": {
-            "json_class": "Pact::Term",
-            "data": {
-              "generate": "application/hal+json",
-              "matcher": {
-                "json_class": "Regexp",
-                "o": 0,
-                "s": "application/hal\\+json"
-              }
-            }
-          }
+          "Content-Type": "application/hal+json"
         },
         "body": {
           "_links": {
@@ -132,6 +118,12 @@
               }
             }
           ]
+        },
+        "matchingRules": {
+          "$.headers.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/hal\\+json"
+          }
         }
       }
     },
@@ -147,17 +139,7 @@
       "response": {
         "status": 200,
         "headers": {
-          "Content-Type": {
-            "json_class": "Pact::Term",
-            "data": {
-              "generate": "application/hal+json",
-              "matcher": {
-                "json_class": "Regexp",
-                "o": 0,
-                "s": "application/hal\\+json"
-              }
-            }
-          }
+          "Content-Type": "application/hal+json"
         },
         "body": {
           "_links": {
@@ -180,6 +162,12 @@
               "number": "1.3.0"
             }
           }
+        },
+        "matchingRules": {
+          "$.headers.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/hal\\+json"
+          }
         }
       }
     },
@@ -204,38 +192,90 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "selectors[]=Foo%2Fversion%2F1.2.3&selectors[]=Bar%2Fversion%2F4.5.6"
+        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
       },
       "response": {
         "status": 200,
         "headers": {
         },
         "body": {
-          "matrix": {
-            "json_class": "Pact::SomethingLike",
-            "contents": [
-              {
-                "consumer": {
-                  "name": "Foo",
-                  "version": {
-                    "number": "4"
-                  }
-                },
-                "provider": {
-                  "name": "Bar",
-                  "version": {
-                    "number": "5"
-                  }
-                },
-                "verificationResult": {
-                  "verifiedAt": "2017-10-10T12:49:04+11:00",
-                  "success": true
-                },
-                "pact": {
-                  "createdAt": "2017-10-10T12:49:04+11:00"
+          "summary": {
+            "compatible": true
+          },
+          "matrix": [
+            {
+              "consumer": {
+                "name": "Foo",
+                "version": {
+                  "number": "4"
+                }
+              },
+              "provider": {
+                "name": "Bar",
+                "version": {
+                  "number": "5"
                 }
+              },
+              "verificationResult": {
+                "verifiedAt": "2017-10-10T12:49:04+11:00",
+                "success": true
+              },
+              "pact": {
+                "createdAt": "2017-10-10T12:49:04+11:00"
               }
-            ]
+            }
+          ]
+        },
+        "matchingRules": {
+          "$.body": {
+            "match": "type"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request for the compatibility matrix for Foo version 1.2.3 and Bar version 4.5.6",
+      "providerState": "the pact for Foo Thing version 1.2.3 has been verified by Bar version 4.5.6",
+      "request": {
+        "method": "get",
+        "path": "/matrix",
+        "query": "q[][pacticipant]=Foo%20Thing&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+        },
+        "body": {
+          "summary": {
+            "compatible": true
+          },
+          "matrix": [
+            {
+              "consumer": {
+                "name": "Foo",
+                "version": {
+                  "number": "4"
+                }
+              },
+              "provider": {
+                "name": "Bar",
+                "version": {
+                  "number": "5"
+                }
+              },
+              "verificationResult": {
+                "verifiedAt": "2017-10-10T12:49:04+11:00",
+                "success": true
+              },
+              "pact": {
+                "createdAt": "2017-10-10T12:49:04+11:00"
+              }
+            }
+          ]
+        },
+        "matchingRules": {
+          "$.body": {
+            "match": "type"
           }
         }
       }
@@ -246,17 +286,23 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "selectors[]=Foo%2Fversion%2F1.2.3&selectors[]=Bar%2Fversion%2F9.9.9"
+        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9"
       },
       "response": {
         "status": 400,
         "headers": {
         },
         "body": {
-          "errors": {
-            "json_class": "Pact::ArrayLike",
-            "contents": "an error message",
+          "errors": [
+            "an error message"
+          ]
+        },
+        "matchingRules": {
+          "$.body.errors": {
             "min": 1
+          },
+          "$.body.errors[*].*": {
+            "match": "type"
           }
         }
       }
@@ -266,17 +312,138 @@
       "request": {
         "method": "get",
         "path": "/matrix",
-        "query": "selectors[]=Foo%2Fversion%2F1.2.3&selectors[]=Bar%2Fversion%2F9.9.9"
+        "query": "q[][pacticipant]=Wiffle&q[][version]=1.2.3&q[][pacticipant]=Meep&q[][version]=9.9.9"
       },
       "response": {
         "status": 400,
         "headers": {
         },
         "body": {
-          "errors": {
-            "json_class": "Pact::ArrayLike",
-            "contents": "an error message",
+          "errors": [
+            "an error message"
+          ]
+        },
+        "matchingRules": {
+          "$.body.errors": {
             "min": 1
+          },
+          "$.body.errors[*].*": {
+            "match": "type"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request for the compatibility matrix for all versions of Foo and Bar",
+      "providerState": "the pact for Foo version 1.2.3 and 1.2.4 has been verified by Bar version 4.5.6",
+      "request": {
+        "method": "get",
+        "path": "/matrix",
+        "query": "q[][pacticipant]=Foo&q[][pacticipant]=Bar"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+        },
+        "body": {
+          "matrix": [
+            {
+              "consumer": {
+                "name": "Foo",
+                "version": {
+                  "number": "4"
+                }
+              },
+              "provider": {
+                "name": "Bar",
+                "version": {
+                  "number": "5"
+                }
+              },
+              "verificationResult": {
+                "verifiedAt": "2017-10-10T12:49:04+11:00",
+                "success": true
+              },
+              "pact": {
+                "createdAt": "2017-10-10T12:49:04+11:00"
+              }
+            },
+            {
+              "consumer": {
+                "name": "Foo",
+                "version": {
+                  "number": "4"
+                }
+              },
+              "provider": {
+                "name": "Bar",
+                "version": {
+                  "number": "5"
+                }
+              },
+              "verificationResult": {
+                "verifiedAt": "2017-10-10T12:49:04+11:00",
+                "success": true
+              },
+              "pact": {
+                "createdAt": "2017-10-10T12:49:04+11:00"
+              }
+            }
+          ]
+        },
+        "matchingRules": {
+          "$.body.matrix": {
+            "min": 2
+          },
+          "$.body.matrix[*].*": {
+            "match": "type"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request for the successful rows of the compatibility matrix for all versions of Foo and Bar",
+      "providerState": "the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6, and 1.2.4 unsuccessfully by 9.9.9",
+      "request": {
+        "method": "get",
+        "path": "/matrix",
+        "query": "q[][pacticipant]=Foo&q[][pacticipant]=Bar&success[]=true"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+        },
+        "body": {
+          "summary": {
+            "compatible": true
+          },
+          "matrix": [
+            {
+              "consumer": {
+                "name": "Foo",
+                "version": {
+                  "number": "4"
+                }
+              },
+              "provider": {
+                "name": "Bar",
+                "version": {
+                  "number": "5"
+                }
+              },
+              "verificationResult": {
+                "verifiedAt": "2017-10-10T12:49:04+11:00",
+                "success": true
+              },
+              "pact": {
+                "createdAt": "2017-10-10T12:49:04+11:00"
+              }
+            }
+          ]
+        },
+        "matchingRules": {
+          "$.body": {
+            "match": "type"
           }
         }
       }
@@ -441,29 +608,19 @@
       "response": {
         "status": 500,
         "headers": {
-          "Content-Type": {
-            "json_class": "Pact::Term",
-            "data": {
-              "generate": "application/hal+json",
-              "matcher": {
-                "json_class": "Regexp",
-                "o": 0,
-                "s": "application/.*json"
-              }
-            }
-          }
+          "Content-Type": "application/hal+json"
         },
         "body": {
-          "message": {
-            "json_class": "Pact::Term",
-            "data": {
-              "generate": "An error occurred",
-              "matcher": {
-                "json_class": "Regexp",
-                "o": 0,
-                "s": ".*"
-              }
-            }
+          "message": "An error occurred"
+        },
+        "matchingRules": {
+          "$.headers.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/.*json"
+          },
+          "$.body.message": {
+            "match": "regex",
+            "regex": ".*"
           }
         }
       }
@@ -604,17 +761,7 @@
       "response": {
         "status": 200,
         "headers": {
-          "Content-Type": {
-            "json_class": "Pact::Term",
-            "data": {
-              "generate": "application/hal+json",
-              "matcher": {
-                "json_class": "Regexp",
-                "o": 0,
-                "s": "application/.*json"
-              }
-            }
-          },
+          "Content-Type": "application/hal+json",
           "X-Pact-Consumer-Version": "1.3.0"
         },
         "body": {
@@ -627,6 +774,12 @@
           "interactions": [
 
           ]
+        },
+        "matchingRules": {
+          "$.headers.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/.*json"
+          }
         }
       }
     },
@@ -689,19 +842,15 @@
         "body": {
           "_links": {
             "self": {
-              "href": {
-                "json_class": "Pact::Term",
-                "data": {
-                  "generate": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/tags/prod",
-                  "matcher": {
-                    "json_class": "Regexp",
-                    "o": 0,
-                    "s": "http://.*/pacticipants/Condor/versions/1.3.0/tags/prod"
-                  }
-                }
-              }
+              "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/tags/prod"
             }
           }
+        },
+        "matchingRules": {
+          "$.body._links.self.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*\\/pacticipants\\/Condor\\/versions\\/1.3.0\\/tags\\/prod"
+          }
         }
       }
     },
@@ -722,19 +871,15 @@
         "body": {
           "_links": {
             "self": {
-              "href": {
-                "json_class": "Pact::Term",
-                "data": {
-                  "generate": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/tags/prod",
-                  "matcher": {
-                    "json_class": "Regexp",
-                    "o": 0,
-                    "s": "http://.*/pacticipants/Condor/versions/1.3.0/tags/prod"
-                  }
-                }
-              }
+              "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/tags/prod"
             }
           }
+        },
+        "matchingRules": {
+          "$.body._links.self.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*\\/pacticipants\\/Condor\\/versions\\/1.3.0\\/tags\\/prod"
+          }
         }
       }
     },
@@ -755,26 +900,22 @@
         "body": {
           "_links": {
             "self": {
-              "href": {
-                "json_class": "Pact::Term",
-                "data": {
-                  "generate": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/tags/prod",
-                  "matcher": {
-                    "json_class": "Regexp",
-                    "o": 0,
-                    "s": "http://.*/pacticipants/Condor/versions/1.3.0/tags/prod"
-                  }
-                }
-              }
+              "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/tags/prod"
             }
           }
+        },
+        "matchingRules": {
+          "$.body._links.self.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*\\/pacticipants\\/Condor\\/versions\\/1.3.0\\/tags\\/prod"
+          }
         }
       }
     }
   ],
   "metadata": {
     "pactSpecification": {
-      "version": "1.0.0"
+      "version": "2.0.0"
     }
   }
 }