3 files changed, 33 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
index 170c5b8565..6a1a4f556f 100644
--- a/actionpack/test/dispatch/middleware_stack_test.rb
+++ b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -66,6 +66,16 @@ class MiddlewareStackTest < ActiveSupport::TestCase
     assert_equal BazMiddleware, @stack[0].klass
   end
 
+  test "raise an error on invalid index" do
+    assert_raise RuntimeError do
+      @stack.insert("HiyaMiddleware", BazMiddleware)
+    end
+
+    assert_raise RuntimeError do
+      @stack.insert_after("HiyaMiddleware", BazMiddleware)
+    end
+  end
+
   test "lazy evaluates middleware class" do
     assert_difference "@stack.size" do
       @stack.use "MiddlewareStackTest::BazMiddleware"
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index e5ee412021..c8947aac80 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -392,19 +392,19 @@ class RequestTest < ActiveSupport::TestCase
     [{'baz'=>[{'foo'=>'baz'}, "1"]}, {'baz'=>[{'foo'=>'[FILTERED]'}, "1"]}, [/foo/]]]
 
     test_hashes.each do |before_filter, after_filter, filter_words|
-      request = stub_request('action_dispatch.parameter_filter' => filter_words)
-      assert_equal after_filter, request.send(:process_parameter_filter, before_filter)
+      parameter_filter = ActionDispatch::Http::ParameterFilter.new(filter_words)
+      assert_equal after_filter, parameter_filter.filter(before_filter)
 
       filter_words << 'blah'
       filter_words << lambda { |key, value|
         value.reverse! if key =~ /bargain/
       }
 
-      request = stub_request('action_dispatch.parameter_filter' => filter_words)
+      parameter_filter = ActionDispatch::Http::ParameterFilter.new(filter_words)
       before_filter['barg'] = {'bargain'=>'gain', 'blah'=>'bar', 'bar'=>{'bargain'=>{'blah'=>'foo'}}}
       after_filter['barg']  = {'bargain'=>'niag', 'blah'=>'[FILTERED]', 'bar'=>{'bargain'=>{'blah'=>'[FILTERED]'}}}
 
-      assert_equal after_filter, request.send(:process_parameter_filter, before_filter)
+      assert_equal after_filter, parameter_filter.filter(before_filter)
     end
   end
 
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index f0e01bfff0..3864821ef0 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -44,7 +44,12 @@ class CookieStoreTest < ActionController::IntegrationTest
       session[:foo] = 'bye!' * 1024
       head :ok
     end
-    
+
+    def change_session_id
+      request.session_options[:id] = nil
+      get_session_id
+    end
+
     def rescue_action(e) raise end
   end
 
@@ -212,6 +217,19 @@ class CookieStoreTest < ActionController::IntegrationTest
     end
   end
 
+  def test_setting_session_id_to_nil_is_respected
+    with_test_route_set do
+      cookies[SessionKey] = SignedBar
+
+      get "/get_session_id"
+      sid = response.body
+      assert_equal sid.size, 36
+
+      get "/change_session_id"
+      assert_not_equal sid, response.body
+    end
+  end
+
   def test_session_store_with_expire_after
     with_test_route_set(:expire_after => 5.hours) do
       # First request accesses the session