Release 0.6.1

Remove comments for Http callout

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

README.adoc

@@ -18,7 +18,7 @@ endif::[]
 :pmtemplates: src/integrationTest/resources/pm-templates
 :imagesdir: docs/images
 :prewrap!:
-:revoman-version: 0.6.0
+:revoman-version: 0.6.1
 
 '''
 
@@ -499,10 +499,10 @@ See in Action:
 
 If an exception is thrown during the procedure of any step,
 the <<Step Procedure>> *fails fast for that step*.
-However, the execution of next steps won't halt by default.
+However, the execution of next *steps won't halt by default*.
 You can configure this behavior to *fail-fast* using the below Configuration options:
 
-* `haltOnAnyFailure` — This defaults to `false`. If set to `true`, the execution of steps fails-fast when it encounters a failure. This also halts if there is a HTTP error response
+* `haltOnAnyFailure` — This defaults to `false`. If set to `true`, the execution of steps fails-fast when it encounters a failure. This also halts if there is an HTTP error response
 * `haltOnFailureOfTypeExcept` — You may configure to Fail-fast only for a specific Failure type by providing an `ExeType`. Along with it, you may provide a  `PostTxnStepPick` which is used to check if a Step can be ignored for that specific failure type or halt the execution of next steps
 
 These Configuration options, as their names suggest,
@@ -515,6 +515,13 @@ bundled with ReṼoman under link:{sourcedir}/com/salesforce/revoman/input/confi
 e.g `withName`,
 `inFolder` etc. You can write a custom predicate of your own too.
 
+==== Compose Modular Executions
+
+* You don't have to squash all your steps into one mega collection. Instead, you can break them into easy-to-manage modular collections. `ReVoman.revUp()` accepts a list of collection paths through `templatePaths()`
+* But that doesn't mean you have to execute all these templates in one-go. You can make multiple `ReVoman.revUp()` calls for different collections.
+* If you wish to compose these executions in a specific order, you can use the `revUp()` overload which accepts a vararg `Kick` configs.
+** You can also achieve the same yourself, by adding the previous execution's `mutableEnv` to the current execution using the `dynamicEnvironment` parameter. This also comes in handy when you wish to execute a common step (e.g. `UserSetup`) inside a Test setup method and use that environment for all the tests.
+
 [#_pre_step_and_post_step_hooks]
 === Pre-Step and Post-Step Hooks
 
@@ -641,13 +648,6 @@ test from link:{testdir}/com/salesforce/revoman/output/postman/PostmanEnvironmen
 
 Each StepReport also has a `pmEnvSnapshot` to assert if a step has executed as expected and compare snapshots from different steps to examine the execution progress.
 
-=== Compose Modular Executions
-
-* You don't have to squash all your steps into one mega collection. Instead, you can break them into easy-to-manage modular collections. `ReVoman.revUp()` accepts a list of collection paths through `templatePaths()`
-* But that doesn't mean you have to execute all these templates in one-go. You can make multiple `ReVoman.revUp()` calls for different collections.
-* If you wish to compose these executions in a specific order, you can use the `revUp()` overload which accepts a vararg `Kick` configs.
-** You can also achieve the same yourself, by adding the previous execution's `mutableEnv` to the current execution using the `dynamicEnvironment` parameter. This also comes in handy when you wish to execute a common step (e.g. `UserSetup`) inside a Test setup method and use that environment for all the tests.
-
 === Custom Dynamic variables
 
 ReṼoman comes

buildSrc/src/main/kotlin/Config.kt

@@ -6,6 +6,6 @@
  * ************************************************************************************************
  */
 const val GROUP_ID = "com.salesforce.revoman"
-const val VERSION = "0.6.0"
+const val VERSION = "0.6.1"
 const val ARTIFACT_ID = "revoman"
 const val STAGING_PROFILE_ID = "1ea0a23e61ba7d"

src/integrationTest/resources/pm-templates/restfulapidev/restful-api.dev.postman_collection.json

@@ -43,8 +43,7 @@
 					"script": {
 						"exec": [
 							"var responseJson = pm.response.json();",
-							"pm.environment.set(\"objId\", responseJson.id);",
-							""
+							"pm.environment.set(\"objId\", responseJson.id);"
 						],
 						"type": "text/javascript",
 						"packages": {}
@@ -55,6 +54,8 @@
 					"script": {
 						"exec": [
 							"var moment = require('moment')",
+							"var _ = require('lodash')",
+							"",
 							"pm.environment.set(\"$currentYear\", moment().year())",
 							"pm.environment.set(\"$randomPrice\", _.random(1, 1000))"
 						],
@@ -68,7 +69,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n   \"name\": \"AI Phone\",  \"data\": {\n      \"year\": {{$currentYear}},\n      \"price\": {{$randomPrice}}\n   }\n}",
+					"raw": "{\n  \"name\": \"{{$randomProduct}}\", // Dynamic variable\n  \"data\": {\n    \"year\": {{$currentYear}}, // Variable set via Pre-req\n    \"price\": {{$randomPrice}} // Variable set via Pre-req\n  }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -108,4 +109,4 @@
 			"response": []
 		}
 	]
-}
+}

src/main/kotlin/com/salesforce/revoman/internal/json/MoshiReVoman.kt

@@ -38,7 +38,7 @@ open class MoshiReVoman(builder: Moshi.Builder) {
 
   private inline fun <reified PojoT : Any> lenientAdapter(): JsonAdapter<PojoT?> =
     moshi.adapter<PojoT>(PojoT::class.java).lenient()
-  
+
   fun <PojoT : Any> fromJson(input: String?, targetType: Type = Any::class.java): PojoT? =
     input?.let { lenientAdapter<PojoT>(targetType).fromJson(it) }
 
@@ -55,10 +55,11 @@ open class MoshiReVoman(builder: Moshi.Builder) {
   fun <PojoT : Any> toPrettyJson(
     input: PojoT?,
     sourceType: Type = input?.javaClass ?: Any::class.java,
-    indent: String = "  "
+    indent: String = "  ",
   ): String = lenientAdapter<PojoT>(sourceType).indent(indent).toJson(input)
-  
-  inline fun <reified PojoT : Any> toPrettyJson(input: PojoT?, indent: String = "  "): String = toPrettyJson(input, PojoT::class.java, indent)
+
+  inline fun <reified PojoT : Any> toPrettyJson(input: PojoT?, indent: String = "  "): String =
+    toPrettyJson(input, PojoT::class.java, indent)
 
   fun <PojoT : Any> objToJsonStrToObj(
     input: Any?,

src/main/kotlin/com/salesforce/revoman/internal/postman/DynamicVariableGenerator.kt

@@ -57,6 +57,7 @@ private val dynamicVariableGenerators: Map<String, () -> String> =
     "\$randomWord" to faker.lorem::words,
     // Business
     "\$randomCompanyName" to faker.company::name,
+    "\$randomProduct" to faker.industrySegments::sector,
     // Domains, emails, and usernames
     "\$randomEmail" to { faker.internet.email() },
     // Date time

src/main/kotlin/com/salesforce/revoman/internal/postman/template/Template.kt

@@ -61,7 +61,15 @@ data class Request(
       .Request(Method.valueOf(method), uri)
       .with(CONTENT_TYPE of contentType)
       .headers(header.map { it.key.trim() to it.value.trim() })
-      .body(body?.raw?.trim() ?: "")
+      .body(body?.raw?.trim()?.let { removeJsonComments(it) } ?: "")
+  }
+
+  companion object {
+    private fun removeJsonComments(json: String): String {
+      val singleLineComment = """//.*""".toRegex()
+      val multiLineComment = """/\*[\s\S]*?\*/""".toRegex()
+      return json.replace(multiLineComment, "").replace(singleLineComment, "")
+    }
   }
 
   internal fun toPMSDKRequest(pm: PostmanSDK): PostmanSDK.Request = pm.from(this)