Fixed bug in which session object in example was not the same instance used in the controller. Closes #331.

Author: dchelimsky

rspec/CHANGES

@@ -5,6 +5,7 @@ Note: we've removed the metaclass method from Object. There were some generated
 used it, and they will now break. Just replace the metaclass call with (class << self; self; end)
 and all will be well.
 
+* Fixed bug in which session object in example was not the same instance used in the controller. Closes #331. 
 * Added stub_model method which creates a real model instance with :id stubbed and data access prohibited.
 * Applied patch from Antti Tarvainen to fix bug where heckle runs rspec runs heckle runs rspec etc. Closes #280.
 * Applied patch from Zach Dennis to merge :steps functionality to :steps_for. Closes #324.

rspec/lib/spec/version.rb

@@ -6,7 +6,7 @@ module VERSION
       TINY   = 3
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20080302232403
+      BUILD_TIME_UTC = 20080309210001
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

rspec_on_rails/lib/spec/rails/example/functional_example_group.rb

@@ -11,9 +11,9 @@ class FunctionalExampleGroup < RailsExampleGroup
           raise "Can't determine controller class for #{@controller_class_name}" if @controller_class.nil?
 
           @controller = @controller_class.new
-
           @request = ActionController::TestRequest.new
           @response = ActionController::TestResponse.new
+          @response.session = @request.session
         end
 
         def params
@@ -25,7 +25,7 @@ def flash
         end
 
         def session
-          request.session
+          @response.session
         end
 
         # :call-seq:

rspec_on_rails/lib/spec/rails/version.rb

@@ -1,7 +1,7 @@
 module Spec
   module Rails
     module VERSION #:nodoc:
-      BUILD_TIME_UTC = 20080302232403
+      BUILD_TIME_UTC = 20080309210001
     end
   end
 end

rspec_on_rails/spec/rails/example/controller_spec_spec.rb

@@ -67,7 +67,7 @@
     end
 
     it "should provide access to flash" do
-      get 'action_with_template'
+      get 'action_which_sets_flash'
       flash[:flash_key].should == "flash value"
     end
 
@@ -82,8 +82,10 @@
     end
 
     it "should provide access to session" do
-      get 'action_with_template'
-      session[:session_key].should == "session value"
+      session[:session_key] = "session value"
+      lambda do
+        get 'action_which_gets_session', :expected => "session value"
+      end.should_not raise_error
     end
 
     it "should support custom routes" do

rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb

@@ -10,11 +10,23 @@ def some_action
   end
 
   def action_with_template
-    session[:session_key] = "session value"
-    flash[:flash_key] = "flash value"
     render :template => "controller_spec/action_with_template"
   end
 
+  def action_which_sets_flash
+    flash[:flash_key] = "flash value"
+    render :text => ""
+  end
+  
+  def action_which_gets_session
+    raise "expected #{params[:session_key].inspect}\ngot #{session[:session_key].inspect}" unless (session[:session_key] == params[:expected])
+    render :text => ""
+  end
+  
+  def action_which_sets_session
+    session[:session_key] = "session value"
+  end
+      
   def action_with_partial
     render :partial => "controller_spec/partial"
   end