Revert "Only save the session if we're actually writing to it [#2703 state:resolved]"

This reverts commit dd98280e38d640f5724887cf8a715b79f0439d2d.

2 files changed, 0 insertions, 30 deletions

diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index 9ac33b3417..47f8496181 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -22,11 +22,6 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
       render :text => "foo: #{session[:foo].inspect}"
     end
 
-    def set_cookie_and_get_session_value
-      cookies["kittens"] = { :value => "fluffy" }
-      render :text => "foo: #{session[:foo].inspect}"
-    end
-
     def get_session_id
       session[:foo]
       render :text => "#{request.session_options[:id]}"
@@ -83,23 +78,6 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     end
   end
 
-  def test_getting_session_value_does_not_set_cookie
-    with_test_route_set do
-      get '/get_session_value'
-      assert_response :success
-      assert_equal "", headers["Set-Cookie"]
-    end
-  end
-
-  def test_getting_session_value_and_setting_a_cookie_doesnt_delete_all_cookies
-    with_test_route_set do
-      get '/set_cookie_and_get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-      assert_equal({"kittens" => "fluffy"}, response.cookies)
-    end
-  end
-
   def test_setting_session_value_after_session_reset
     with_test_route_set do
       get '/set_session_value'
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 278f2c83ea..7561c93e4a 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -61,14 +61,6 @@ class MemCacheStoreTest < ActionController::IntegrationTest
       end
     end
 
-    def test_getting_session_value_does_not_set_cookie
-      with_test_route_set do
-        get '/get_session_value'
-        assert_response :success
-        assert_equal "", headers["Set-Cookie"]
-      end
-    end
-
     def test_setting_session_value_after_session_reset
       with_test_route_set do
         get '/set_session_value'