[DRE-commits] [ruby-cookiejar] 05/08: removed patch fix-test-failures, included by upstream

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository ruby-cookiejar.

commit 3570a7fa90ab0eab2ab918c6150eb3c8ab222420
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Mon Feb 17 20:48:41 2014 +0100

    removed patch fix-test-failures, included by upstream
---
 debian/patches/fix-test-failures.patch | 29 -----------------------------
 debian/patches/series                  |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/fix-test-failures.patch b/debian/patches/fix-test-failures.patch
deleted file mode 100644
index cadf90f..0000000
--- a/debian/patches/fix-test-failures.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: use :create_additions to force creation
- of object from JSON with ruby-json post CVE-2013-0269
-Forwarded: https://github.com/dwaite/cookiejar/pull/7
-Origin: vendor
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-06-06
-
---- a/test/jar_test.rb
-+++ b/test/jar_test.rb
-@@ -214,7 +213,7 @@
-       
-       it "should automatically deserialize to a jar" do
-         json = "{\"json_class\":\"CookieJar::Jar\",\"cookies\":[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]}" 
--        jar = JSON.parse json
-+        jar = JSON.parse json, :create_additions => true
-         jar.get_cookies('https://localhost/').should have(1).items  
-       end
-     end
---- a/test/cookie_test.rb
-+++ b/test/cookie_test.rb
-@@ -163,7 +163,7 @@
-       end
-       it "should automatically deserialize to a cookie" do
-         json = "{\"json_class\":\"CookieJar::Cookie\",\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2009-09-11 19:10:00 -0600\",\"secure\":true}" 
--        c = JSON.parse json
-+        c = JSON.parse json, :create_additions => true
-         c.should be_a Cookie
-         CookieValidation.validate_cookie 'https://localhost/', c
-       end
diff --git a/debian/patches/series b/debian/patches/series
index f3efaba..7458898 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-test-failures.patch
 remove-rubygems.patch

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