Merge pull request #2714 from srmppn/feature/fix-forward-slashes

Fix forward slashes being turned into escape

Author: ptrthomas

karate-core/src/main/java/com/intuit/karate/JsonUtils.java

@@ -64,6 +64,8 @@ public class JsonUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(JsonUtils.class);
 
+    private static final JSONStyle JSON_STYLE = new JSONStyle(JSONStyle.FLAG_PROTECT_4WEB);
+
     private JsonUtils() {
         // only static methods
     }
@@ -108,7 +110,7 @@ public static String toStrictJson(String raw) {
         JSONParser jp = new JSONParser(JSONParser.MODE_PERMISSIVE);
         try {
             Object o = jp.parse(raw);
-            return JSONValue.toJSONString(o);
+            return JSONValue.toJSONString(o, JSON_STYLE);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -121,7 +123,7 @@ public static String toJson(Object o) {
     public static String toJson(Object o, boolean pretty) {
         if (!pretty) { // TODO use JSONStyleIdent in json-smart 2.4
             try {
-                return JSONValue.toJSONString(o);
+                return JSONValue.toJSONString(o, JSON_STYLE);
             } catch (Throwable t) {
                 logger.warn("object to json serialization failure, trying alternate approach: {}", t.getMessage());
             }

karate-core/src/main/java/com/intuit/karate/core/Variable.java

@@ -228,11 +228,11 @@ public String getAsString() {
             case LIST:
             case MAP:
                 try {
-                return JsonUtils.toJson(value);
-            } catch (Throwable t) {
-                logger.warn("conversion to json string failed, will attempt to use fall-back approach: {}", t.getMessage());
-                return JsonUtils.toJsonSafe(value, false);
-            }
+                    return JsonUtils.toJson(value);
+                } catch (Throwable t) {
+                    logger.warn("conversion to json string failed, will attempt to use fall-back approach: {}", t.getMessage());
+                    return JsonUtils.toJsonSafe(value, false);
+                }
             case XML:
                 return XmlUtils.toString(getValue());
             default:

karate-core/src/test/java/com/intuit/karate/JsonUtilsTest.java

@@ -22,7 +22,7 @@ class JsonUtilsTest {
     @Test
     void testParse() {
         String temp = JsonUtils.toStrictJson("{redirect:{url:'/index'}}");
-        assertEquals(temp, "{\"redirect\":{\"url\":\"\\/index\"}}");
+        assertEquals("{\"redirect\":{\"url\":\"/index\"}}", temp);
     }
 
     @Test

karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerTest.java

@@ -120,4 +120,14 @@ void testKeepOriginalResponseHeaders() {
         matchContains(response.getHeaders().keySet(), "X-Special-Header");
         matchContains(response.getHeaders().keySet(), "X-Custom-Header");
     }
+
+    @Test
+    void testResponseHavingForwardSlashes() {
+        background()
+                .scenario(
+                        "pathMatches('/hello')",
+                        "def response = { 'url': 'https://test123' }");
+        response = handle().path("/hello").invoke("get");
+        match(response.getBody(), "{\"url\":\"https://test123\"}".getBytes());
+    }
 }

karate-core/src/test/java/com/intuit/karate/core/StepRuntimeTest.java

@@ -101,7 +101,7 @@ private static Stream<Arguments> testParameters() throws ClassNotFoundException,
                         com.intuit.karate.ScenarioActions.class.getMethod("print", String.class),
                         new ArrayList<String>() { { add("\"name:\", name"); }},
                         "print \"name:\", name"),
-                Arguments.of("com.intuit.karate.ScenarioActions.print(java.lang.String) [\"'test with\\/slash'\"]", // JSON escapes forward slash
+                Arguments.of("com.intuit.karate.ScenarioActions.print(java.lang.String) [\"'test with/slash'\"]", // JSON with forward slash
                         com.intuit.karate.ScenarioActions.class,
                         com.intuit.karate.ScenarioActions.class.getMethod("print", String.class),
                         new ArrayList<String>() { { add("'test with/slash'"); }},