From cc2642b220958894c5a384530f32f622f76cd097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 29 Jan 2010 17:21:31 +0100
Subject: Added :format and :locale options to render.

---
 actionpack/test/abstract/render_test.rb | 41 ++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

(limited to 'actionpack/test/abstract/render_test.rb')

diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index 9a0a140bee..db924633ca 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -17,7 +17,11 @@ module AbstractController
         "renderer/symbol.erb" => "With Symbol",
         "renderer/template_name.erb" => "With Template Name",
         "string/with_path.erb" => "With String With Path",
-        "some/file.erb" => "With File"
+        "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"
       )]
 
       def template
@@ -59,6 +63,22 @@ module AbstractController
       def object
         render :_template => ActionView::Template::Text.new("With Object")
       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,6 +137,25 @@ module AbstractController
         assert_equal "With Object", @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
-- 
cgit v1.2.3