2 files changed, 21 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 4e83ad16d7..93d89f7568 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1124,6 +1124,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '/sheep/1/_it', _it_sheep_path(1)
   end
 
+  def test_resource_does_not_modify_passed_options
+    options = {:id => /.+?/, :format => /json|xml/}
+    self.class.stub_controllers do |routes|
+      routes.draw do
+        resource :user, options
+      end
+    end
+    assert_equal({:id => /.+?/, :format => /json|xml/}, options)
+  end
+
+  def test_resources_does_not_modify_passed_options
+    options = {:id => /.+?/, :format => /json|xml/}
+    self.class.stub_controllers do |routes|
+      routes.draw do
+        resources :users, options
+      end
+    end
+    assert_equal({:id => /.+?/, :format => /json|xml/}, options)
+  end
+
   def test_path_names
     get '/pt/projetos'
     assert_equal 'projects#index', @response.body
diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
index a74e165826..b8479e8836 100644
--- a/actionpack/test/dispatch/session/cache_store_test.rb
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'fixtures/session_autoload_test/session_autoload_test/foo'
 
 class CacheStoreTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base