From def14505b717d8ef36c80e40f17dab54ec331d05 Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Sun, 14 Jun 2015 02:44:51 +0930 Subject: Revert "revises a test to account for case-insensitive file systems" This reverts commit d345ce9630ce4c01bc81a09fb015e7bd935600ad. --- actionview/test/actionpack/controller/render_test.rb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'actionview/test/actionpack') diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb index c4228b5683..ebaf39a12d 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'active_model' -require 'fileutils' class ApplicationController < ActionController::Base self.view_paths = File.join(FIXTURE_LOAD_PATH, "actionpack") @@ -679,14 +678,6 @@ 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 @@ -753,15 +744,8 @@ class RenderTest < ActionController::TestCase end def test_render_action_upcased - action = :render_action_upcased_hello_world - - if case_sensitive_file_system? - assert_raise ActionView::MissingTemplate do - get action - end - else - get action - assert_equal 'Hello world!', @response.body + assert_raise ActionView::MissingTemplate do + get :render_action_upcased_hello_world end end -- cgit v1.2.3