diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2008-03-13 11:52:53 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-03-13 11:52:53 +0000 |
commit | 58c30f61351dae43900c3b6cb5dd3622f12ecee0 (patch) | |
tree | 855d064b9eba2d482a2279cb6fb2b11b178ca56c | |
parent | 1e0ac3a673a6cc92c1c6c5bc84180afeb60241d9 (diff) | |
download | rails-58c30f61351dae43900c3b6cb5dd3622f12ecee0.tar.gz rails-58c30f61351dae43900c3b6cb5dd3622f12ecee0.tar.bz2 rails-58c30f61351dae43900c3b6cb5dd3622f12ecee0.zip |
Move tests from action_view_test.rb to template_finder_test.rb so that they get run by default take task. [Pratik]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9021 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | actionpack/test/action_view_test.rb | 43 | ||||
-rw-r--r-- | actionpack/test/template/template_finder_test.rb | 34 |
2 files changed, 33 insertions, 44 deletions
diff --git a/actionpack/test/action_view_test.rb b/actionpack/test/action_view_test.rb deleted file mode 100644 index fb27fbfec4..0000000000 --- a/actionpack/test/action_view_test.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'abstract_unit' - -class ActionViewTests < Test::Unit::TestCase - def test_find_template_extension_from_first_render - base = ActionView::Base.new - - assert_nil base.send(:find_template_extension_from_first_render) - - { - nil => nil, - '' => nil, - 'foo' => nil, - '/foo' => nil, - 'foo.rb' => 'rb', - 'foo.bar.rb' => 'bar.rb', - 'baz/foo.rb' => 'rb', - 'baz/foo.bar.rb' => 'bar.rb', - 'baz/foo.o/foo.rb' => 'rb', - 'baz/foo.o/foo.bar.rb' => 'bar.rb', - }.each do |input,expectation| - base.instance_variable_set('@first_render', input) - assert_equal expectation, base.send(:find_template_extension_from_first_render) - end - end - - def test_should_report_file_exists_correctly - base = ActionView::Base.new - - assert_nil base.send(:find_template_extension_from_first_render) - - assert_equal false, base.send(:file_exists?, 'test.rhtml') - assert_equal false, base.send(:file_exists?, 'test.rb') - - base.instance_variable_set('@first_render', 'foo.rb') - - assert_equal 'rb', base.send(:find_template_extension_from_first_render) - - assert_equal false, base.send(:file_exists?, 'baz') - assert_equal false, base.send(:file_exists?, 'baz.rb') - - end - -end diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb index 2b9569f099..8640d22e02 100644 --- a/actionpack/test/template/template_finder_test.rb +++ b/actionpack/test/template/template_finder_test.rb @@ -30,7 +30,39 @@ class TemplateFinderTest < Test::Unit::TestCase assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*").find_all {|f| !File.directory?(f) }.size, ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size end + + def test_find_template_extension_from_first_render + assert_nil @finder.send(:find_template_extension_from_first_render) + { + nil => nil, + '' => nil, + 'foo' => nil, + '/foo' => nil, + 'foo.rb' => 'rb', + 'foo.bar.rb' => 'bar.rb', + 'baz/foo.rb' => 'rb', + 'baz/foo.bar.rb' => 'bar.rb', + 'baz/foo.o/foo.rb' => 'rb', + 'baz/foo.o/foo.bar.rb' => 'bar.rb', + }.each do |input,expectation| + @template.instance_variable_set('@first_render', input) + assert_equal expectation, @finder.send(:find_template_extension_from_first_render) + end + end + + def test_should_report_file_exists_correctly + assert_nil @finder.send(:find_template_extension_from_first_render) + assert_equal false, @finder.send(:file_exists?, 'test.rhtml') + assert_equal false, @finder.send(:file_exists?, 'test.rb') + + @template.instance_variable_set('@first_render', 'foo.rb') + + assert_equal 'rb', @finder.send(:find_template_extension_from_first_render) + assert_equal false, @finder.send(:file_exists?, 'baz') + assert_equal false, @finder.send(:file_exists?, 'baz.rb') + end + uses_mocha 'Template finder tests' do def test_should_update_extension_cache_when_template_handler_is_registered @@ -39,5 +71,5 @@ class TemplateFinderTest < Test::Unit::TestCase end end - + end |