From e1659af3724e2320e9f2f2bd7cf602686e8aa523 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 30 Jan 2020 12:48:05 +0100
Subject: Add an option to escape forward slash character

Squashed commit of the following:

commit 26d181059989279a79c433cedcd893b4f52e42ee
Author: Francois Chagnon <francois.chagnon@jadedpixel.com>
Date:   Tue Sep 15 21:17:34 2015 +0000

    add config options for escape_slash

commit fa282334051b16df91ca097dd7304b46f3bc7719
Author: Francois Chagnon <francois.chagnon@jadedpixel.com>
Date:   Mon Feb 9 21:09:33 2015 +0000

    add forward slash to escape character
---
 test/json/json_generator_test.rb | 7 +++++++
 test/json/json_parser_test.rb    | 4 ++++
 2 files changed, 11 insertions(+)
 mode change 100644 => 100755 test/json/json_generator_test.rb

(limited to 'test')

diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
old mode 100644
new mode 100755
index ee19fa5e6c..13d3b5ab91
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -174,6 +174,7 @@ EOT
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
+      :escape_slash          => false,
       :indent                => "  ",
       :max_nesting           => 100,
       :object_nl             => "\n",
@@ -190,6 +191,7 @@ EOT
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
+      :escape_slash          => false,
       :indent                => "",
       :max_nesting           => 100,
       :object_nl             => "",
@@ -206,6 +208,7 @@ EOT
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
+      :escape_slash          => false,
       :indent                => "",
       :max_nesting           => 0,
       :object_nl             => "",
@@ -394,6 +397,10 @@ EOT
     json = '["/"]'
     assert_equal json, generate(data)
     #
+    data = [ '/' ]
+    json = '["\/"]'
+    assert_equal json, generate(data, :escape_slash => true)
+    #
     data = ['"']
     json = '["\""]'
     assert_equal json, generate(data)
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index 9946dd93e7..514441efce 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -293,6 +293,10 @@ EOT
     json = '["\\\'"]'
     data = ["'"]
     assert_equal data, parse(json)
+
+    json = '["\/"]'
+    data = [ '/' ]
+    assert_equal data, parse(json)
   end
 
   class SubArray < Array
-- 
cgit v1.2.3