1 files changed, 20 insertions, 4 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 8b47536a18..d69c070ede 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
-require "active_model"
+require 'active_model'
+require 'fileutils'
 
 class ApplicationController < ActionController::Base
   self.view_paths = File.join(FIXTURE_LOAD_PATH, "actionpack")
@@ -357,7 +358,7 @@ class TestController < ApplicationController
   end
 
   def rendering_nothing_on_layout
-    render :nothing => true
+    head :ok
   end
 
   def render_to_string_with_assigns
@@ -678,6 +679,14 @@ class RenderTest < ActionController::TestCase
     ActionView::Base.logger = nil
   end
 
+  def case_sensitive_file_system?
+    fname = '.case_sensitive_file_system_test'
+    FileUtils.touch(fname)
+    !File.exist?(fname.upcase)
+  ensure
+    FileUtils.rm_f(fname)
+  end
+
   # :ported:
   def test_simple_show
     get :hello_world
@@ -747,8 +756,15 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_render_action_upcased
-    assert_raise ActionView::MissingTemplate do
-      get :render_action_upcased_hello_world
+    action = :render_action_upcased_hello_world
+
+    if case_sensitive_file_system?
+      assert_raise ActionView::MissingTemplate do
+        get action
+      end
+    else
+      get action
+      assert_template 'test/Hello_world'
     end
   end