aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/actionpack
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-06-14 02:44:51 +0930
committerMatthew Draper <matthew@trebex.net>2015-06-14 02:46:40 +0930
commitdef14505b717d8ef36c80e40f17dab54ec331d05 (patch)
treec80ed35b5182f0a33aaf94b53732f327e1b46463 /actionview/test/actionpack
parentdfc9269517d787d187ee46c798a4ea0893de0381 (diff)
downloadrails-def14505b717d8ef36c80e40f17dab54ec331d05.tar.gz
rails-def14505b717d8ef36c80e40f17dab54ec331d05.tar.bz2
rails-def14505b717d8ef36c80e40f17dab54ec331d05.zip
Revert "revises a test to account for case-insensitive file systems"
This reverts commit d345ce9630ce4c01bc81a09fb015e7bd935600ad.
Diffstat (limited to 'actionview/test/actionpack')
-rw-r--r--actionview/test/actionpack/controller/render_test.rb20
1 files changed, 2 insertions, 18 deletions
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