fix: queryMatchingDatetime creates invalid genetator #1612

pact-foundation · Nov 25, 2022 · 28ff522 · 28ff522
1 parent aece98d
commit 28ff522
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/consumer/src/main/java/au/com/dius/pact/consumer/dsl/PactDslRequestBase.java b/consumer/src/main/java/au/com/dius/pact/consumer/dsl/PactDslRequestBase.java
@@ -83,7 +83,7 @@ protected PactDslRequestBase queryMatchingDateBase(String field, String pattern,
     if (StringUtils.isNotEmpty(example)) {
       query.put(field, Collections.singletonList(example));
     } else {
-      requestGenerators.addGenerator(Category.BODY, field, new DateGenerator(pattern, null));
+      requestGenerators.addGenerator(Category.QUERY, field, new DateGenerator(pattern, null));
       FastDateFormat instance = FastDateFormat.getInstance(pattern);
       query.put(field, Collections.singletonList(instance.format(new Date(DATE_2000))));
     }
@@ -95,7 +95,7 @@ protected PactDslRequestBase queryMatchingTimeBase(String field, String pattern,
     if (StringUtils.isNotEmpty(example)) {
       query.put(field, Collections.singletonList(example));
     } else {
-      requestGenerators.addGenerator(Category.BODY, field, new TimeGenerator(pattern, null));
+      requestGenerators.addGenerator(Category.QUERY, field, new TimeGenerator(pattern, null));
       FastDateFormat instance = FastDateFormat.getInstance(pattern);
       query.put(field, Collections.singletonList(instance.format(new Date(DATE_2000))));
     }
@@ -107,7 +107,7 @@ protected PactDslRequestBase queryMatchingDatetimeBase(String field, String patt
     if (StringUtils.isNotEmpty(example)) {
       query.put(field, Collections.singletonList(example));
     } else {
-      requestGenerators.addGenerator(Category.BODY, field, new DateTimeGenerator(pattern, null));
+      requestGenerators.addGenerator(Category.QUERY , field, new DateTimeGenerator(pattern, null));
       FastDateFormat instance = FastDateFormat.getInstance(pattern);
       query.put(field, Collections.singletonList(instance.format(new Date(DATE_2000))));
     }

diff --git a/consumer/src/test/groovy/au/com/dius/pact/consumer/dsl/PactDslRequestWithPathSpec.groovy b/consumer/src/test/groovy/au/com/dius/pact/consumer/dsl/PactDslRequestWithPathSpec.groovy
@@ -2,6 +2,7 @@ package au.com.dius.pact.consumer.dsl
 
 import au.com.dius.pact.consumer.ConsumerPactBuilder
 import au.com.dius.pact.core.model.OptionalBody
+import au.com.dius.pact.core.model.PactSpecVersion
 import au.com.dius.pact.core.model.generators.Generators
 import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl
 import au.com.dius.pact.core.model.matchingrules.RegexMatcher
@@ -149,4 +150,28 @@ class PactDslRequestWithPathSpec extends Specification {
     request.requestHeaders == ['content-type': ['text/plain']]
   }
 
+  @Issue('#1612')
+  def 'queryMatchingDatetime creates invalid generator'() {
+    given:
+    PactDslWithProvider consumerPactBuilder = ConsumerPactBuilder
+      .consumer('spec')
+      .hasPactWith('spec')
+
+    when:
+    def pact = consumerPactBuilder
+      .uponReceiving("a request")
+      .path("/api/myrequest")
+      .method("POST")
+      .queryMatchingDatetime("startDateTime", "yyyy-MM-dd'T'hh:mm:ss'Z'")
+      .willRespondWith()
+      .status(200)
+      .toPact()
+    def request = pact.interactions.first()
+    def generators = request.request.generators
+
+    then:
+    generators.toMap(PactSpecVersion.V3) == [
+      query: [startDateTime: [type: 'DateTime', format: "yyyy-MM-dd'T'hh:mm:ss'Z'"]]
+    ]
+  }
 }