[DRE-commits] [ruby-gon] 04/04: refresh more patches

[Praveen Arimbrathodiyil]

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

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

commit 21ab4057bbd4894704fb43f51c32c8b6c2c62add
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 1 16:16:29 2015 +0530

    refresh more patches
---
 debian/patches/fix-json-scaping-on-tests-strings | 32 ++++++++++++++----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix-json-scaping-on-tests-strings b/debian/patches/fix-json-scaping-on-tests-strings
index a133608..4b55507 100644
--- a/debian/patches/fix-json-scaping-on-tests-strings
+++ b/debian/patches/fix-json-scaping-on-tests-strings
@@ -6,24 +6,28 @@ Forwarded: https://github.com/gazay/gon/pull/159
 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
+Index: ruby-gon/spec/gon/basic_spec.rb
+===================================================================
+--- ruby-gon.orig/spec/gon/basic_spec.rb
++++ ruby-gon/spec/gon/basic_spec.rb
+@@ -117,7 +117,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"
++     else
 +        escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
 +      end
-       expect(@base.include_gon).to eq('<script type="text/javascript">' +
+       expect(@base.include_gon).to eq('<script>' +
                                      "\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
+Index: ruby-gon/spec/gon/global_spec.rb
+===================================================================
+--- ruby-gon.orig/spec/gon/global_spec.rb
++++ ruby-gon/spec/gon/global_spec.rb
+@@ -73,7 +73,11 @@ describe Gon::Global do
  
      it 'outputs correct js with a script string' do
        Gon.global.str = %q(</script><script>alert('!')</script>)
@@ -33,11 +37,13 @@ Last-Update: 2014-10-11
 +      else
 +        escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
 +      end
-       expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+       expect(@base.include_gon).to eq("<script>" +
                                      "\n//<![CDATA[\n" +
                                      "window.gon={};" +
---- a/spec/gon/watch_spec.rb
-+++ b/spec/gon/watch_spec.rb
+Index: ruby-gon/spec/gon/watch_spec.rb
+===================================================================
+--- ruby-gon.orig/spec/gon/watch_spec.rb
++++ ruby-gon/spec/gon/watch_spec.rb
 @@ -66,7 +66,11 @@ describe Gon::Watch do
      end
  
@@ -50,4 +56,4 @@ Last-Update: 2014-10-11
 +      end
  
        before do
-         controller.stub(params: {
+         allow(controller).to receive_messages(params: {

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