rpms/rubygem-actionpack/F-11 rubygem-actionpack-2.3.2-fix-reset_session.patch, NONE, 1.1 import.log, 1.2, 1.3 rubygem-actionpack.spec, 1.12, 1.13

[Jeroen van Meeuwen]

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-actionpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28938/F-11

Modified Files:
	import.log rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.3.2-fix-reset_session.patch 
Log Message:
2.3.2-3

rubygem-actionpack-2.3.2-fix-reset_session.patch:
 active_record_store_test.rb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE rubygem-actionpack-2.3.2-fix-reset_session.patch ---
commit 01478e930c124db4bbbc70df17343848b0e70a7d
Author: Joshua Peek <josh at joshpeek.com>
Date:   Sun May 17 14:44:19 2009 -0500

    Fix reset_session with ActiveRecord store [#2200 state:resolved]

diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index c98892e..bde36eb 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -27,9 +27,9 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     end
 
     def call_reset_session
-      session[:bar]
+      session[:foo]
       reset_session
-      session[:bar] = "baz"
+      session[:foo] = "baz"
       head :ok
     end
 
@@ -86,7 +86,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
 
       get '/get_session_value'
       assert_response :success
-      assert_equal 'foo: nil', response.body
+      assert_equal 'foo: "baz"', response.body
 
       get '/get_session_id'
       assert_response :success


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	28 Jul 2009 21:20:58 -0000	1.2
+++ import.log	21 Oct 2009 14:36:10 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-actionpack-2_3_2-1_fc10:HEAD:rubygem-actionpack-2.3.2-1.fc10.src.rpm:1237201627
 rubygem-actionpack-2_3_3-1_fc11:F-11:rubygem-actionpack-2.3.3-1.fc11.src.rpm:1248815949
+rubygem-actionpack-2_3_2-3_fc12:F-11:rubygem-actionpack-2.3.2-3.fc12.src.rpm:1256135754


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/rubygem-actionpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-actionpack.spec	7 Oct 2009 22:32:41 -0000	1.12
+++ rubygem-actionpack.spec	21 Oct 2009 14:36:10 -0000	1.13
@@ -4,29 +4,31 @@
 %define gemname actionpack
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: Web-flow and rendering framework putting the VC in MVC
-Name: rubygem-%{gemname}
-Epoch: 1
-Version: 2.3.2
-Release: 2%{?dist}
-Group: Development/Languages
-License: MIT
-URL: http://www.rubyonrails.org
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0:  rubygem-actionpack-2.3.x-CVE-2009-3009.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
-Requires: rubygem(activesupport) = %{version}
-BuildRequires: rubygems
-BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Summary:        Web-flow and rendering framework putting the VC in MVC
+Name:           rubygem-%{gemname}
+Epoch:          1
+Version:        2.3.2
+Release:        3%{?dist}
+Group:          Development/Languages
+License:        MIT
+URL:            http://www.rubyonrails.org
+Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:         rubygem-actionpack-2.3.x-CVE-2009-3009.patch
+# Ticket #2200 upstream. see also:
+# https://rails.lighthouseapp.com/projects/8994/tickets/2200-session-support-broken#ticket-2200-23
+Patch1:         rubygem-actionpack-2.3.2-fix-reset_session.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       rubygems
+Requires:       rubygem(activesupport) = %{version}
+BuildRequires:  rubygems
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 Eases web-request routing, handling, and response as a half-way front,
 half-way page controller. Implemented with specific emphasis on enabling easy
 unit/integration testing that doesn't require a browser.
 
-
 %prep
 
 %build
@@ -38,7 +40,8 @@ gem install --local --install-dir %{buil
             --force --rdoc %{SOURCE0}
 
 pushd %{buildroot}%{geminstdir}
-cat %{PATCH0} | patch -s -p2
+patch -s -p2 < %{PATCH0}
+patch -s -p2 < %{PATCH1}
 popd
 
 # Remove backup files
@@ -77,6 +80,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-3
+- Fix activerecord test for reset_session (#2200 upstream)
+
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
 - Bump epoch; rails is not updatable across versions (bz 520843)