aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-08 20:39:15 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-08 20:39:15 +0100
commitbdf5096816d03f2bdaefd20a07a0fa562543549c (patch)
tree3e656b06836772e74f8c44492d61caddb6bfb893 /actionpack/test/abstract
parent67a6725bf934452219cc054c8cd0535148d4fcd4 (diff)
downloadrails-bdf5096816d03f2bdaefd20a07a0fa562543549c.tar.gz
rails-bdf5096816d03f2bdaefd20a07a0fa562543549c.tar.bz2
rails-bdf5096816d03f2bdaefd20a07a0fa562543549c.zip
Move details to lookup_context and make resolvers use the cache key.
Diffstat (limited to 'actionpack/test/abstract')
-rw-r--r--actionpack/test/abstract/render_test.rb42
1 files changed, 1 insertions, 41 deletions
diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index e54d056666..25dc8bd804 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -16,11 +16,7 @@ module AbstractController
"renderer/string.erb" => "With String",
"renderer/symbol.erb" => "With Symbol",
"string/with_path.erb" => "With String With Path",
- "some/file.erb" => "With File",
- "with_format.html.erb" => "With html format",
- "with_format.xml.erb" => "With xml format",
- "with_locale.en.erb" => "With en locale",
- "with_locale.pl.erb" => "With pl locale"
+ "some/file.erb" => "With File"
)]
def template
@@ -54,22 +50,6 @@ module AbstractController
def symbol
render :symbol
end
-
- def with_html_format
- render :template => "with_format", :format => :html
- end
-
- def with_xml_format
- render :template => "with_format", :format => :xml
- end
-
- def with_en_locale
- render :template => "with_locale"
- end
-
- def with_pl_locale
- render :template => "with_locale", :locale => :pl
- end
end
class TestRenderer < ActiveSupport::TestCase
@@ -117,26 +97,6 @@ module AbstractController
@controller.process(:string_with_path)
assert_equal "With String With Path", @controller.response_body
end
-
- def test_render_with_html_format
- @controller.process(:with_html_format)
- assert_equal "With html format", @controller.response_body
- end
-
- def test_render_with_xml_format
- @controller.process(:with_xml_format)
- assert_equal "With xml format", @controller.response_body
- end
-
- def test_render_with_en_locale
- @controller.process(:with_en_locale)
- assert_equal "With en locale", @controller.response_body
- end
-
- def test_render_with_pl_locale
- @controller.process(:with_pl_locale)
- assert_equal "With pl locale", @controller.response_body
- end
end
end
end