5 files changed, 11 insertions, 33 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index d04a2aa1f3..a05bae5dcc 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,5 +1,3 @@
-ORIG_ARGV = ARGV.dup
-
 require File.expand_path("../../../load_paths", __FILE__)
 
 require 'stringio'
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 999f666a64..e66e81ea2c 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -83,6 +83,17 @@ module ApplicationTests
       assert_equal "Rack::Config", middleware.second
     end
 
+    test "RAILS_CACHE does not respond to middleware" do
+      add_to_config "config.cache_store = :memory_store"
+      boot!
+      assert_equal "Rack::Runtime", middleware.third
+    end
+
+    test "RAILS_CACHE does respond to middleware" do
+      boot!
+      assert_equal "Rack::Runtime", middleware.fourth
+    end
+
     test "insert middleware before" do
       add_to_config "config.middleware.insert_before ActionDispatch::Static, Rack::Config"
       boot!
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 96fd7a0a72..55d5bd6f83 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -59,14 +59,6 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_singleton_resource
-    run_generator ["account", "--singleton"]
-
-    assert_file "config/routes.rb" do |route|
-      assert_match /resource :account$/, route
-    end
-  end
-
   def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 8040b22fe6..d55ed22975 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -78,20 +78,6 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_generates_singleton_controller
-    run_generator ["User", "name:string", "age:integer", "--singleton"]
-
-    assert_file "app/controllers/users_controller.rb" do |content|
-      assert_no_match /def index/, content
-    end
-
-    assert_file "test/functional/users_controller_test.rb" do |content|
-      assert_no_match /test "should get index"/, content
-    end
-
-    assert_no_file "app/views/users/index.html.erb"
-  end
-
   def test_skip_helper_if_required
     run_generator ["User", "name:string", "age:integer", "--no-helper"]
     assert_no_file "app/helpers/users_helper.rb"
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 2accaca855..c74cc01dc1 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -48,15 +48,6 @@ module RailtiesTest
       assert_equal "hello", AppTemplate::Application.config.foo.greetings
     end
 
-    test "railtie can add log subscribers" do
-      begin
-        class Foo < Rails::Railtie ; log_subscriber(:foo, Rails::LogSubscriber.new) ; end
-        assert_kind_of Rails::LogSubscriber, Rails::LogSubscriber.log_subscribers[0]
-      ensure
-        Rails::LogSubscriber.log_subscribers.clear
-      end
-    end
-
     test "railtie can add to_prepare callbacks" do
       $to_prepare = false
       class Foo < Rails::Railtie ; config.to_prepare { $to_prepare = true } ; end