[DRE-commits] [ruby-gon] 04/07: Add 'fix-json-scaping-on-tests-strings'patch

[David Suárez]

This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository ruby-gon.

commit 87fa8e0e3fdf114175bbb99ae3d3e09b82118dba
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sun Oct 12 01:21:37 2014 +0200

    Add 'fix-json-scaping-on-tests-strings'patch
---
 debian/patches/fix-json-scaping-on-tests-strings | 52 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/fix-json-scaping-on-tests-strings b/debian/patches/fix-json-scaping-on-tests-strings
new file mode 100644
index 0000000..62305cc
--- /dev/null
+++ b/debian/patches/fix-json-scaping-on-tests-strings
@@ -0,0 +1,52 @@
+Description: Fix forward slash scaping on tests strings
+ Oj seems to scape the forward slash, that is legal but not required
+
+Author: David Suárez <david.sephirot at gmail.com>
+Bug-Debian: https://bugs.debian.org/759909
+Last-Update: 2014-10-11
+
+--- a/spec/gon/basic_spec.rb
++++ b/spec/gon/basic_spec.rb
+@@ -98,7 +98,11 @@ describe Gon do
+ 
+     it 'outputs correct js with a script string' do
+       Gon.str = %q(</script><script>alert('!')</script>)
+-      escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
++      if MultiJson.current_adapter.instance.class.name == 'MultiJson::Adapters::Oj'
++        escaped_str = "\\u003c\\/script\\u003e\\u003cscript\\u003ealert('!')\\u003c\\/script\\u003e"
++      else
++        escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
++      end
+       expect(@base.include_gon).to eq('<script type="text/javascript">' +
+                                     "\n//<![CDATA[\n" +
+                                     'window.gon={};' +
+--- a/spec/gon/global_spec.rb
++++ b/spec/gon/global_spec.rb
+@@ -77,7 +77,11 @@ describe Gon::Global do
+ 
+     it 'outputs correct js with a script string' do
+       Gon.global.str = %q(</script><script>alert('!')</script>)
+-      escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
++      if MultiJson.current_adapter.instance.class.name == 'MultiJson::Adapters::Oj'
++        escaped_str = "\\u003c\\/script\\u003e\\u003cscript\\u003ealert('!')\\u003c\\/script\\u003e"
++      else
++        escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
++      end
+       expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+                                     "\n//<![CDATA[\n" +
+                                     "window.gon={};" +
+--- a/spec/gon/watch_spec.rb
++++ b/spec/gon/watch_spec.rb
+@@ -66,7 +66,11 @@ describe Gon::Watch do
+     end
+ 
+     context 'when request variable is json unsafe content' do
+-      let(:expected) { %Q{"\\u003cscript\\u003e'\\"\\u003c/script\\u003e&#x2028;Dangerous"} }
++      if MultiJson.current_adapter.instance.class.name == 'MultiJson::Adapters::Oj'
++        let(:expected) { %Q{"\\u003cscript\\u003e'\\"\\u003c\\/script\\u003e&#x2028;Dangerous"} }
++      else
++        let(:expected) { %Q{"\\u003cscript\\u003e'\\"\\u003c/script\\u003e&#x2028;Dangerous"} }
++      end
+ 
+       before do
+         controller.stub(params: {
diff --git a/debian/patches/series b/debian/patches/series
index 3aed63e..9eff755 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 change_watch_js_location.patch
 remove_lib_from_loadpath_for_spec.patch
+fix-json-scaping-on-tests-strings

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gon.git