fix: MessagePactBuilder was not including the generators #1278

pact-foundation · Dec 27, 2020 · bc73a74 · bc73a74
1 parent 0c1eef4
commit bc73a74
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/consumer/junit/src/test/groovy/au/com/dius/pact/consumer/junit/MessagePactBuilderSpec.groovy b/consumer/junit/src/test/groovy/au/com/dius/pact/consumer/junit/MessagePactBuilderSpec.groovy
@@ -5,6 +5,7 @@ import au.com.dius.pact.consumer.dsl.Matchers
 import au.com.dius.pact.consumer.dsl.PactDslJsonBody
 import au.com.dius.pact.consumer.xml.PactXmlBuilder
 import au.com.dius.pact.core.model.OptionalBody
+import au.com.dius.pact.core.model.generators.DateTimeGenerator
 import au.com.dius.pact.core.model.messaging.Message
 import au.com.dius.pact.core.model.ProviderState
 import groovy.json.JsonSlurper
@@ -153,7 +154,7 @@ class MessagePactBuilderSpec extends Specification {
     pact.providerStates.last() == expectedProviderState
   }
 
-  def 'should support XML content'() {
+  def 'supports XML content'() {
     given:
     def xmlContent = new PactXmlBuilder("root")
     .build(root -> {
@@ -185,4 +186,23 @@ class MessagePactBuilderSpec extends Specification {
     ] as Set
 
   }
+
+  @Issue('#1278')
+  def 'Include any generators defined for the message contents'() {
+    given:
+    def body = new PactDslJsonBody()
+      .datetime('DT')
+    def category = au.com.dius.pact.core.model.generators.Category.BODY
+
+    when:
+    def pact = MessagePactBuilder
+      .consumer('MessagePactBuilderSpec')
+      .expectsToReceive('a message with generators')
+      .withContent(body).toPact()
+    Message message = pact.interactions.first()
+    def generators = message.generators
+
+    then:
+    generators.categories[category] == ['$.DT': new DateTimeGenerator("yyyy-MM-dd'T'HH:mm:ss")]
+  }
 }
diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/MessagePactBuilder.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/MessagePactBuilder.kt
@@ -143,6 +143,7 @@ class MessagePactBuilder(
     message.contents = OptionalBody.body(parent.toString().toByteArray(contentType.asCharset()), contentType)
     message.metaData = metadata
     message.matchingRules.addCategory(parent.matchers)
+    message.generators.addGenerators(parent.generators)
 
     return this
   }