Merge remote branch 'rails/master'

4 files changed, 171 insertions, 141 deletions

diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index d1e1338a17..2f3869994c 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1425,12 +1425,11 @@ class FormHelperTest < ActionView::TestCase
 
   class LabelledFormBuilder < ActionView::Helpers::FormBuilder
     (field_helpers - %w(hidden_field)).each do |selector|
-      src, line = <<-END_SRC, __LINE__ + 1
+      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def #{selector}(field, *args, &proc)
           ("<label for='\#{field}'>\#{field.to_s.humanize}:</label> " + super + "<br/>").html_safe
         end
-      END_SRC
-      class_eval src, __FILE__, line
+      RUBY_EVAL
     end
   end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 1c095b621e..b75863bb6a 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -206,6 +206,12 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_text_area_tag_unescaped_nil_content
+    actual = text_area_tag "body", nil, :escape => false
+    expected = %(<textarea id="body" name="body"></textarea>)
+    assert_dom_equal expected, actual
+  end
+
   def test_text_field_tag
     actual = text_field_tag "title", "Hello!"
     expected = %(<input id="title" name="title" type="text" value="Hello!" />)
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index c1a38a25de..16e5ee4f72 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -2,21 +2,23 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 
 module ActionView
-  class TestCase
-    module ATestHelper
-    end
 
-    module AnotherTestHelper
-      def from_another_helper
-        'Howdy!'
-      end
+  module ATestHelper
+  end
+
+  module AnotherTestHelper
+    def from_another_helper
+      'Howdy!'
     end
+  end
 
-    module ASharedTestHelper
-      def from_shared_helper
-        'Holla!'
-      end
+  module ASharedTestHelper
+    def from_shared_helper
+      'Holla!'
     end
+  end
+
+  class TestCase
     helper ASharedTestHelper
 
     module SharedTests
@@ -29,161 +31,186 @@ module ActionView
         end
       end
     end
+  end
 
-    class GeneralViewTest < ActionView::TestCase
-      include SharedTests
-      test_case = self
+  class GeneralViewTest < ActionView::TestCase
+    include SharedTests
+    test_case = self
 
-      test "works without testing a helper module" do
-        assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
-      end
+    test "works without testing a helper module" do
+      assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
+    end
 
-      test "can render a layout with block" do
-        assert_equal "Before (ChrisCruft)\n!\nAfter",
-                      render(:layout => "test/layout_for_partial", :locals => {:name => "ChrisCruft"}) {"!"}
-      end
+    test "can render a layout with block" do
+      assert_equal "Before (ChrisCruft)\n!\nAfter",
+                    render(:layout => "test/layout_for_partial", :locals => {:name => "ChrisCruft"}) {"!"}
+    end
 
-      helper AnotherTestHelper
-      test "additional helper classes can be specified as in a controller" do
-        assert test_case.ancestors.include?(AnotherTestHelper)
-        assert_equal 'Howdy!', from_another_helper
-      end
+    helper AnotherTestHelper
+    test "additional helper classes can be specified as in a controller" do
+      assert test_case.ancestors.include?(AnotherTestHelper)
+      assert_equal 'Howdy!', from_another_helper
+    end
+
+    test "determine_default_helper_class returns nil if name.sub(/Test$/, '').constantize resolves to a class" do
+      assert_nil self.class.determine_default_helper_class("String")
     end
 
-    class ClassMethodsTest < ActionView::TestCase
-      include SharedTests
-      test_case = self
+    test "delegates notice to request.flash" do
+      _view.request.flash.expects(:notice).with("this message")
+      _view.notice("this message")
+    end
 
-      tests ATestHelper
-      test "tests the specified helper module" do
-        assert_equal ATestHelper, test_case.helper_class
-        assert test_case.ancestors.include?(ATestHelper)
-      end
+    test "delegates alert to request.flash" do
+      _view.request.flash.expects(:alert).with("this message")
+      _view.alert("this message")
+    end
+  end
 
-      helper AnotherTestHelper
-      test "additional helper classes can be specified as in a controller" do
-        assert test_case.ancestors.include?(AnotherTestHelper)
-        assert_equal 'Howdy!', from_another_helper
+  class ClassMethodsTest < ActionView::TestCase
+    include SharedTests
+    test_case = self
 
-        test_case.helper_class.module_eval do
-          def render_from_helper
-            from_another_helper
-          end
-        end
-        assert_equal 'Howdy!', render(:partial => 'test/from_helper')
-      end
+    tests ATestHelper
+    test "tests the specified helper module" do
+      assert_equal ATestHelper, test_case.helper_class
+      assert test_case.ancestors.include?(ATestHelper)
     end
 
-    class ATestHelperTest < ActionView::TestCase
-      include SharedTests
-      test_case = self
+    helper AnotherTestHelper
+    test "additional helper classes can be specified as in a controller" do
+      assert test_case.ancestors.include?(AnotherTestHelper)
+      assert_equal 'Howdy!', from_another_helper
 
-      test "inflects the name of the helper module to test from the test case class" do
-        assert_equal ATestHelper, test_case.helper_class
-        assert test_case.ancestors.include?(ATestHelper)
+      test_case.helper_class.module_eval do
+        def render_from_helper
+          from_another_helper
+        end
       end
+      assert_equal 'Howdy!', render(:partial => 'test/from_helper')
+    end
+  end
 
-      test "a configured test controller is available" do
-        assert_kind_of ActionController::Base, controller
-        assert_equal '', controller.controller_path
+  class HelperInclusionTest < ActionView::TestCase
+    module RenderHelper
+      def render_from_helper
+        render :partial => 'customer', :collection => @customers
       end
+    end
 
-      test "helper class that is being tested is always included in view instance" do
-        # This ensure is a hidious hack to deal with these tests bleeding
-        # methods between eachother
-        begin
-          self.class.helper_class.module_eval do
-            def render_from_helper
-              render :partial => 'customer', :collection => @customers
-            end
-          end
+    helper RenderHelper
 
-          TestController.stubs(:controller_path).returns('test')
+    test "helper class that is being tested is always included in view instance" do
+      @controller.controller_path = 'test'
 
-          @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
-          assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+      @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+      assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+    end
+  end
 
-        ensure
-          self.class.helper_class.send(:remove_method, :render_from_helper)
-        end
+  class HelperExposureTest < ActionView::TestCase
+    helper(Module.new do
+      def render_from_helper
+        from_test_case
       end
+    end)
+    test "is able to make methods available to the view" do
+      assert_equal 'Word!', render(:partial => 'test/from_helper')
+    end
 
-      test "no additional helpers should shared across test cases" do
-        assert !test_case.ancestors.include?(AnotherTestHelper)
-        assert_raise(NoMethodError) { send :from_another_helper }
-      end
+    def from_test_case; 'Word!'; end
+    helper_method :from_test_case
+  end
 
-      test "is able to use routes" do
-        controller.request.assign_parameters(@routes, 'foo', 'index')
-        assert_equal '/foo', url_for
-        assert_equal '/bar', url_for(:controller => 'bar')
+  class IgnoreProtectAgainstForgeryTest < ActionView::TestCase
+    module HelperThatInvokesProtectAgainstForgery
+      def help_me
+        protect_against_forgery?
       end
+    end
 
-      test "is able to use named routes" do
-        with_routing do |set|
-          set.draw { |map| resources :contents }
-          assert_equal 'http://test.host/contents/new', new_content_url
-          assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
-        end
-      end
+    helper HelperThatInvokesProtectAgainstForgery
 
-      test "named routes can be used from helper included in view" do
-        with_routing do |set|
-          set.draw { |map| resources :contents }
-          _helpers.module_eval do
-            def render_from_helper
-              new_content_url
-            end
-          end
+    test "protect_from_forgery? in any helpers returns false" do
+      assert !_view.help_me
+    end
 
-          assert_equal 'http://test.host/contents/new', render(:partial => 'test/from_helper')
-        end
-      end
+  end
 
-      test "is able to render partials with local variables" do
-        assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
-        assert_equal 'Eloy', render(:partial => 'developers/developer',
-                                    :locals => { :developer => stub(:name => 'Eloy') })
-      end
+  class ATestHelperTest < ActionView::TestCase
+    include SharedTests
+    test_case = self
+
+    test "inflects the name of the helper module to test from the test case class" do
+      assert_equal ATestHelper, test_case.helper_class
+      assert test_case.ancestors.include?(ATestHelper)
+    end
+
+    test "a configured test controller is available" do
+      assert_kind_of ActionController::Base, controller
+      assert_equal '', controller.controller_path
+    end
 
-      test "is able to render partials from templates and also use instance variables" do
-        TestController.stubs(:controller_path).returns('test')
+    test "no additional helpers should shared across test cases" do
+      assert !test_case.ancestors.include?(AnotherTestHelper)
+      assert_raise(NoMethodError) { send :from_another_helper }
+    end
 
-        @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
-        assert_match /Hello: EloyHello: Manfred/, render(:file => 'test/list')
+    test "is able to use routes" do
+      controller.request.assign_parameters(@routes, 'foo', 'index')
+      assert_equal '/foo', url_for
+      assert_equal '/bar', url_for(:controller => 'bar')
+    end
+
+    test "is able to use named routes" do
+      with_routing do |set|
+        set.draw { |map| resources :contents }
+        assert_equal 'http://test.host/contents/new', new_content_url
+        assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
       end
+    end
 
-      test "is able to make methods available to the view" do
-        # This ensure is a hidious hack to deal with these tests bleeding
-        # methods between eachother
-        begin
-          _helpers.module_eval do
-            def render_from_helper; from_test_case end
+    test "named routes can be used from helper included in view" do
+      with_routing do |set|
+        set.draw { |map| resources :contents }
+        _helpers.module_eval do
+          def render_from_helper
+            new_content_url
           end
-          assert_equal 'Word!', render(:partial => 'test/from_helper')
-        ensure
-          _helpers.send(:remove_method, :render_from_helper)
         end
+
+        assert_equal 'http://test.host/contents/new', render(:partial => 'test/from_helper')
       end
+    end
 
-      def from_test_case; 'Word!'; end
-      helper_method :from_test_case
+    test "is able to render partials with local variables" do
+      assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
+      assert_equal 'Eloy', render(:partial => 'developers/developer',
+                                  :locals => { :developer => stub(:name => 'Eloy') })
     end
 
-    class AssertionsTest < ActionView::TestCase
-      def render_from_helper
-        form_tag('/foo') do
-          safe_concat render(:text => '<ul><li>foo</li></ul>')
-        end
+    test "is able to render partials from templates and also use instance variables" do
+      @controller.controller_path = "test"
+
+      @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+      assert_match /Hello: EloyHello: Manfred/, render(:file => 'test/list')
+    end
+
+  end
+
+  class AssertionsTest < ActionView::TestCase
+    def render_from_helper
+      form_tag('/foo') do
+        safe_concat render(:text => '<ul><li>foo</li></ul>')
       end
-      helper_method :render_from_helper
+    end
+    helper_method :render_from_helper
 
-      test "uses the output_buffer for assert_select" do
-        render(:partial => 'test/from_helper')
+    test "uses the output_buffer for assert_select" do
+      render(:partial => 'test/from_helper')
 
-        assert_select 'form' do
-          assert_select 'li', :text => 'foo'
-        end
+      assert_select 'form' do
+        assert_select 'li', :text => 'foo'
       end
     end
   end
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index b382b5eb22..1be418a206 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -18,16 +18,9 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert_equal expected, translate(:foo)
   end
 
-  def test_translation_of_an_array
-    I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
-    assert_equal "foobar", translate(["foo", "bar"])
-  end
-
-  def test_translation_of_an_array_with_html
-    expected = '<a href="#">foo</a><a href="#">bar</a>'
-    I18n.expects(:translate).with(["foo", "bar", "html"], :raise => true).returns(['<a href="#">foo</a>', '<a href="#">bar</a>'])
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
-    assert_equal expected, @view.render(:file => "test/array_translation")
+  def test_translation_returning_an_array
+    I18n.expects(:translate).with(:foo, :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(:foo)
   end
 
   def test_delegates_localize_to_i18n
@@ -43,9 +36,9 @@ class TranslationHelperTest < ActiveSupport::TestCase
   end
 
   def test_scoping_by_partial_of_an_array
-    I18n.expects(:translate).with("test.scoped_array_translation.foo.bar", :raise => true).returns(["foo", "bar"])
+    I18n.expects(:translate).with("test.scoped_translation.foo.bar", :raise => true).returns(["foo", "bar"])
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
-    assert_equal "foobar", @view.render(:file => "test/scoped_array_translation")
+    assert_equal "foobar", @view.render(:file => "test/scoped_translation")
   end
   
   def test_translate_does_not_mark_plain_text_as_safe_html
@@ -62,4 +55,9 @@ class TranslationHelperTest < ActiveSupport::TestCase
     I18n.expects(:translate).with("hello_html", :raise => true).returns("<a>Hello World</a>")
     assert translate("hello_html").html_safe?
   end
+
+  def test_translation_returning_an_array_ignores_html_suffix
+    I18n.expects(:translate).with(:foo_html, :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(:foo_html)
+  end
 end