fix: pact found bug in pact example tests

pact-foundation · Jun 7, 2021 · 4525047 · 4525047
1 parent 7e89481
commit 4525047
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 17 deletions.
diff --git a/examples/consumer_test.go b/examples/consumer_test.go
@@ -48,7 +48,7 @@ func TestConsumerV2(t *testing.T) {
 		WillRespondWith(200).
 		WithHeader("Content-Type", Regex("application/json", "application\\/json")).
 		WithJSONBody(Map{
-			"dateTime": Regex("2020-01-01", "[0-9\\-]+"),
+			"datetime": Regex("2020-01-01", "[0-9\\-]+"),
 			"name":     S("Billy"),
 			"lastName": S("Sampson"),
 			"itemsMin": ArrayMinLike("thereshouldbe3ofthese", 3),
@@ -125,7 +125,7 @@ func TestConsumerV3(t *testing.T) {
 		WillRespondWith(200).
 		WithHeader("Content-Type", S("application/json")).
 		WithJSONBody(Map{
-			"dateTime":       Regex("2020-01-01", "[0-9\\-]+"),
+			"datetime":       Regex("2020-01-01", "[0-9\\-]+"),
 			"name":           S("Billy"),
 			"lastName":       S("Sampson"),
 			"superstring":    Includes("foo"),

diff --git a/examples/pacts/V2Consumer-V2Provider.json b/examples/pacts/V2Consumer-V2Provider.json
@@ -33,10 +33,6 @@
           "$.header.Authorization": {
             "match": "type"
           },
-          "$.header.Content-Type": {
-            "match": "regex",
-            "regex": "application\\/json"
-          },
           "$.path": {
             "match": "regex",
             "regex": "\\/foo.*"
@@ -60,7 +56,7 @@
       },
       "response": {
         "body": {
-          "dateTime": "2020-01-01",
+          "datetime": "2020-01-01",
           "itemsMin": [
             "thereshouldbe3ofthese",
             "thereshouldbe3ofthese",
@@ -73,13 +69,17 @@
           "Content-Type": "application/json"
         },
         "matchingRules": {
-          "$.body.dateTime": {
+          "$.body.datetime": {
             "match": "regex",
             "regex": "[0-9\\-]+"
           },
           "$.body.itemsMin": {
             "match": "type",
             "min": 3
+          },
+          "$.header.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/json"
           }
         },
         "status": 200

diff --git a/examples/pacts/V2ConsumerMatch-V2ProviderMatch.json b/examples/pacts/V2ConsumerMatch-V2ProviderMatch.json
@@ -33,10 +33,6 @@
           "$.header.Authorization": {
             "match": "type"
           },
-          "$.header.Content-Type": {
-            "match": "regex",
-            "regex": "application\\/json"
-          },
           "$.path": {
             "match": "regex",
             "regex": "\\/foo.*"
@@ -59,6 +55,33 @@
         "query": "baz=bar&baz=bat&baz=baz"
       },
       "response": {
+        "body": {
+          "datetime": "2020-01-01'T'08:00:45,format=yyyy-MM-dd'T'HH:mm:ss,generator=datetime",
+          "id": 27,
+          "lastName": "Sampson",
+          "name": "Billy"
+        },
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "matchingRules": {
+          "$.body.datetime": {
+            "match": "type"
+          },
+          "$.body.id": {
+            "match": "type"
+          },
+          "$.body.lastName": {
+            "match": "type"
+          },
+          "$.body.name": {
+            "match": "type"
+          },
+          "$.header.Content-Type": {
+            "match": "regex",
+            "regex": "application\\/json"
+          }
+        },
         "status": 200
       }
     }

diff --git a/examples/pacts/V3Consumer-V3Provider.json b/examples/pacts/V3Consumer-V3Provider.json
@@ -141,7 +141,7 @@
               "foo": "bar"
             }
           ],
-          "dateTime": "2020-01-01",
+          "datetime": "2020-01-01",
           "equality": "a thing",
           "id": 12,
           "itemsMin": [
@@ -222,7 +222,7 @@
                 }
               ]
             },
-            "$.dateTime": {
+            "$.datetime": {
               "combine": "AND",
               "matchers": [
                 {
@@ -275,7 +275,8 @@
                 }
               ]
             }
-          }
+          },
+          "header": {}
         },
         "status": 200
       }

diff --git a/examples/pacts/V3MessageConsumer-V3MessageProvider.json b/examples/pacts/V3MessageConsumer-V3MessageProvider.json
@@ -32,7 +32,10 @@
           }
         }
       },
-      "metadata": {},
+      "metadata": {
+        "Content-Type": "application/json",
+        "contentType": "application/json"
+      },
       "providerStates": [
         {
           "name": "User with id 127 exists",

diff --git a/examples/provider_test.go b/examples/provider_test.go
@@ -130,7 +130,7 @@ func startServer() {
 		fmt.Fprintf(w, `
 			{
 				"accountBalance": 123.76,
-				"dateTime": "2020-01-01",
+				"datetime": "2020-01-01",
 				"equality": "a thing",
 				"id": 12,
 				"itemsMin": [