3 files changed, 66 insertions, 4 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 35ea2729d3..7269a7c5a8 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -28,8 +28,10 @@ module ApplicationTests
       RUBY
 
       require "#{app_path}/config/environment"
-      ActionController::Base.view_paths.include?(File.expand_path("app/views", app_path))
-      ActionMailer::Base.view_paths.include?(File.expand_path("app/views", app_path))
+
+      expanded_path = File.expand_path("app/views", app_path)
+      assert_equal ActionController::Base.view_paths[0].to_s, expanded_path
+      assert_equal ActionMailer::Base.view_paths[0].to_s, expanded_path
     end
 
     test "allows me to configure default url options for ActionMailer" do
@@ -40,7 +42,7 @@ module ApplicationTests
       RUBY
 
       require "#{app_path}/config/environment"
-      assert "test.rails", ActionMailer::Base.default_url_options[:host]
+      assert_equal "test.rails", ActionMailer::Base.default_url_options[:host]
     end
 
     # AS
@@ -57,7 +59,7 @@ module ApplicationTests
 
       Dir.chdir("#{app_path}/app") do
         require "#{app_path}/config/environment"
-        assert_raises(NoMethodError) { [1,2,3].sample }
+        assert_raises(NoMethodError) { [1,2,3].forty_two }
       end
     end
 
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/application/runner_test.rb b/railties/test/application/runner_test.rb
new file mode 100644
index 0000000000..d37b7649e2
--- /dev/null
+++ b/railties/test/application/runner_test.rb
@@ -0,0 +1,49 @@
+require 'isolation/abstract_unit'
+
+module ApplicationTests
+  class RunnerTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def setup
+      build_app
+      boot_rails
+
+      # Lets create a model so we have something to play with
+      app_file "app/models/user.rb", <<-MODEL
+      class User
+        def self.count
+          42
+        end
+      end
+      MODEL
+    end
+
+    def test_should_run_ruby_statement
+       assert_match "42", Dir.chdir(app_path) { `bundle exec rails runner "puts User.count"` }
+    end
+
+    def test_should_run_file
+      app_file "script/count_users.rb", <<-SCRIPT
+      puts User.count
+      SCRIPT
+
+      assert_match "42", Dir.chdir(app_path) { `bundle exec rails runner "script/count_users.rb"` }
+    end
+
+    def test_should_set_dollar_0_to_file
+      app_file "script/dollar0.rb", <<-SCRIPT
+      puts $0
+      SCRIPT
+
+      assert_match "script/dollar0.rb", Dir.chdir(app_path) { `bundle exec rails runner "script/dollar0.rb"` }
+    end
+
+    def test_should_set_dollar_program_name_to_file
+      app_file "script/program_name.rb", <<-SCRIPT
+      puts $PROGRAM_NAME
+      SCRIPT
+
+      assert_match "script/program_name.rb", Dir.chdir(app_path) { `bundle exec rails runner "script/program_name.rb"` }
+    end
+  end
+end