[DRE-commits] [SCM] ruby-actionpack-3.2.git branch, master, updated. debian/3.2.13-7-3-g305285d

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit e8a350936249e2a527c02570f269366f30eb5a55
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jun 4 18:54:06 2013 -0300

    Fix test session to work with Rack 1.5

diff --git a/debian/patches/rack-1.5.patch b/debian/patches/rack-1.5.patch
new file mode 100644
index 0000000..4e2fb5d
--- /dev/null
+++ b/debian/patches/rack-1.5.patch
@@ -0,0 +1,30 @@
+diff --git a/lib/action_controller/test_case.rb b/lib/action_controller/test_case.rb
+index bc6828a..d0214ed 100644
+--- a/lib/action_controller/test_case.rb
++++ b/lib/action_controller/test_case.rb
+@@ -225,13 +225,24 @@ module ActionController
+ 
+     def initialize(session = {})
+       super(nil, nil)
+-      replace(session.stringify_keys)
++      @id = SecureRandom.hex(16)
++      @data = stringify_keys(session)
+       @loaded = true
+     end
+ 
+     def exists?
+       true
+     end
++
++    def destroy
++      clear
++    end
++
++    private
++
++      def load!
++        @id
++      end
+   end
+ 
+   # Superclass for ActionController functional tests. Functional tests allow you to
diff --git a/debian/patches/series b/debian/patches/series
index 051d498..f2c3aa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-fix_sprockets_speed_regression.patch
 0003-allow_newer_rack_versions.patch
 0004-allow_newer_versions.patch
+rack-1.5.patch

-- 
ruby-actionpack-3.2.git