actionpack 1.12.5 → 1.13.0

data/test/template/deprecated_helper_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class DeprecatedHelperTest < Test::Unit::TestCase
+  include ActionView::Helpers::JavaScriptHelper
+  include ActionView::Helpers::CaptureHelper
+  
+  def test_update_element_function
+    assert_deprecated 'update_element_function' do
+      
+      assert_equal %($('myelement').innerHTML = 'blub';\n),
+        update_element_function('myelement', :content => 'blub')
+      assert_equal %($('myelement').innerHTML = 'blub';\n),
+        update_element_function('myelement', :action => :update, :content => 'blub')
+      assert_equal %($('myelement').innerHTML = '';\n),
+        update_element_function('myelement', :action => :empty)
+      assert_equal %(Element.remove('myelement');\n),
+        update_element_function('myelement', :action => :remove)
+        
+      assert_equal %(new Insertion.Bottom('myelement','blub');\n),
+        update_element_function('myelement', :position => 'bottom', :content => 'blub')
+      assert_equal %(new Insertion.Bottom('myelement','blub');\n),
+        update_element_function('myelement', :action => :update, :position => :bottom, :content => 'blub')
+        
+      _erbout = ""
+      assert_equal %($('myelement').innerHTML = 'test';\n),
+        update_element_function('myelement') { _erbout << "test" }
+        
+      _erbout = ""
+      assert_equal %($('myelement').innerHTML = 'blockstuff';\n),
+        update_element_function('myelement', :content => 'paramstuff') { _erbout << "blockstuff" }
+      
+    end
+  end
+
+end
+

data/test/template/deprecated_instance_variables_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class DeprecatedViewInstanceVariablesTest < Test::Unit::TestCase
+  class DeprecatedInstanceVariablesController < ActionController::Base
+    self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
+
+    def self.controller_path; 'deprecated_instance_variables' end
+
+    ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |var|
+      class_eval <<-end_eval
+        def old_#{var}_inline;  render :inline => '<%= @#{var}.to_s %>'  end
+        def new_#{var}_inline;  render :inline => '<%= #{var}.to_s %>'   end
+        def old_#{var}_partial; render :partial => '#{var}_ivar'    end
+        def new_#{var}_partial; render :partial => '#{var}_method'  end
+      end_eval
+    end
+
+    def rescue_action(e) raise e end
+  end
+
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller = DeprecatedInstanceVariablesController.new
+  end
+
+  ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |var|
+    class_eval <<-end_eval, __FILE__, __LINE__
+      def test_old_#{var}_is_deprecated
+        assert_deprecated('@#{var}') { get :old_#{var}_inline }
+      end
+      def test_new_#{var}_isnt_deprecated
+        assert_not_deprecated { get :new_#{var}_inline }
+      end
+      def test_old_#{var}_partial_is_deprecated
+        assert_deprecated('@#{var}') { get :old_#{var}_partial }
+      end
+      def test_new_#{var}_partial_isnt_deprecated
+        assert_not_deprecated { get :new_#{var}_partial }
+      end
+    end_eval
+  end
+end

data/test/template/form_helper_test.rb

@@ -120,6 +120,12 @@ class FormHelperTest < Test::Unit::TestCase
       radio_button("post", "secret", "1")
    )
   end
+  
+  def test_radio_button_respects_passed_in_id
+     assert_dom_equal('<input checked="checked" id="foo" name="post[secret]" type="radio" value="1" />',
+       radio_button("post", "secret", "1", :id=>"foo")
+    )
+  end
 
   def test_text_area
     assert_dom_equal(
@@ -143,6 +149,13 @@ class FormHelperTest < Test::Unit::TestCase
     )
   end
   
+  def test_text_area_with_size_option
+    assert_dom_equal(
+      '<textarea cols="183" id="post_body" name="post[body]" rows="820">Back to the hill and over it again!</textarea>',
+      text_area("post", "body", :size => "183x820")
+    )
+  end
+  
   def test_date_selects
     assert_dom_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
@@ -232,6 +245,27 @@ class FormHelperTest < Test::Unit::TestCase
     assert_dom_equal expected, _erbout
   end
 
+  def test_form_for_with_method
+    _erbout = ''
+
+    form_for(:post, @post, :html => { :id => 'create-post', :method => :put }) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+
+    expected = 
+      "<form action='http://www.example.com' id='create-post' method='post'>" +
+      "<div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div>" +
+      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "</form>"
+
+    assert_dom_equal expected, _erbout
+  end
+
   def test_form_for_without_object
     _erbout = ''
 
@@ -251,6 +285,24 @@ class FormHelperTest < Test::Unit::TestCase
 
     assert_dom_equal expected, _erbout
   end
+  
+  def test_form_for_with_index
+    _erbout = ''
+    
+    form_for("post[]", @post) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    
+    expected = 
+      "<form action='http://www.example.com' method='post'>" +
+      "<input name='post[123][title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[123][body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[123][secret]' type='hidden' value='0' />" +
+      "</form>"
+  end
 
   def test_fields_for
     _erbout = ''
@@ -344,7 +396,31 @@ class FormHelperTest < Test::Unit::TestCase
 
     assert_dom_equal expected, _erbout
   end
-  
+
+  def test_default_form_builder
+    old_default_form_builder, ActionView::Base.default_form_builder =
+      ActionView::Base.default_form_builder, LabelledFormBuilder
+
+    _erbout = ''
+    form_for(:post, @post) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+
+    expected = 
+      "<form action='http://www.example.com' method='post'>" +
+      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+      "</form>"
+
+    assert_dom_equal expected, _erbout
+  ensure
+    ActionView::Base.default_form_builder = old_default_form_builder
+  end
+
   # Perhaps this test should be moved to prototype helper tests.
   def test_remote_form_for_with_labelled_builder
     self.extend ActionView::Helpers::PrototypeHelper

data/test/template/form_options_helper_test.rb

@@ -103,6 +103,10 @@ class FormOptionsHelperTest < Test::Unit::TestCase
         "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
         options_for_select([ "ruby", "rubyonrails" ], "ruby")
       )
+      assert_dom_equal(
+        %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
+        options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
+      )
   end
 
   def test_hash_options_for_select

data/test/template/form_tag_helper_test.rb

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
 class FormTagHelperTest < Test::Unit::TestCase
-
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::CaptureHelper
 
   def setup
     @controller = Class.new do
@@ -33,6 +34,28 @@ class FormTagHelperTest < Test::Unit::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_form_tag_with_method
+    actual = form_tag({}, { :method => :put })
+    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="put" /></div>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_form_tag_with_block
+    _erbout = ''
+    form_tag("http://example.com") { _erbout.concat "Hello world!" }
+
+    expected = %(<form action="http://www.example.com" method="post">Hello world!</form>)
+    assert_dom_equal expected, _erbout
+  end
+
+  def test_form_tag_with_block_and_method
+    _erbout = ''
+    form_tag("http://example.com", :method => :put) { _erbout.concat "Hello world!" }
+
+    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
+    assert_dom_equal expected, _erbout
+  end
+
   def test_hidden_field_tag
     actual = hidden_field_tag "id", 3
     expected = %(<input id="id" name="id" type="hidden" value="3" />)
@@ -47,8 +70,21 @@ class FormTagHelperTest < Test::Unit::TestCase
 
   def test_radio_button_tag
     actual = radio_button_tag "people", "david"
-    expected = %(<input id="people" name="people" type="radio" value="david" />)
+    expected = %(<input id="people_david" name="people" type="radio" value="david" />)
+    assert_dom_equal expected, actual
+
+    actual = radio_button_tag("num_people", 5)
+    expected = %(<input id="num_people_5" name="num_people" type="radio" value="5" />)
+    assert_dom_equal expected, actual
+
+    actual = radio_button_tag("gender", "m") + radio_button_tag("gender", "f")
+    expected = %(<input id="gender_m" name="gender" type="radio" value="m" /><input id="gender_f" name="gender" type="radio" value="f" />)
+    assert_dom_equal expected, actual
+    
+    actual = radio_button_tag("opinion", "-1") + radio_button_tag("opinion", "1")
+    expected = %(<input id="opinion_-1" name="opinion" type="radio" value="-1" /><input id="opinion_1" name="opinion" type="radio" value="1" />)
     assert_dom_equal expected, actual
+    
   end
 
   def test_select_tag
@@ -106,3 +142,31 @@ class FormTagHelperTest < Test::Unit::TestCase
   end
 end
 
+class DeprecatedFormTagHelperTest < Test::Unit::TestCase
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::CaptureHelper
+
+  def setup
+    @controller = Class.new do
+      def url_for(options, *parameters_for_method_reference)
+        "http://www.example.com"
+      end
+    end
+    @controller = @controller.new
+  end
+
+  def test_start_form_tag_deprecation
+    assert_deprecated /start_form_tag/ do
+      start_form_tag
+    end
+  end
+  
+  def test_end_form_tag_deprecation
+    assert_deprecated /end_form_tag/ do
+      end_form_tag
+    end
+  end
+end

data/test/template/java_script_macros_helper_test.rb

@@ -38,6 +38,8 @@ class JavaScriptMacrosHelperTest < Test::Unit::TestCase
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {afterUpdateElement:function(element,value){alert('You have chosen: '+value)}})\n//]]>\n</script>),
       auto_complete_field("some_input", :url => { :action => "autocomplete" }, 
         :after_update_element => "function(element,value){alert('You have chosen: '+value)}");
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {paramName:'huidriwusch'})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :param_name => 'huidriwusch');
   end
   
   def test_auto_complete_result
@@ -53,8 +55,9 @@ class JavaScriptMacrosHelperTest < Test::Unit::TestCase
   end
   
   def test_text_field_with_auto_complete
-    assert_match "<style>",
+    assert_match %(<style type="text/css">),
       text_field_with_auto_complete(:message, :recipient)
+
     assert_dom_equal %(<input id=\"message_recipient\" name=\"message[recipient]\" size=\"30\" type=\"text\" /><div class=\"auto_complete\" id=\"message_recipient_auto_complete\"></div><script type=\"text/javascript\">\n//<![CDATA[\nvar message_recipient_auto_completer = new Ajax.Autocompleter('message_recipient', 'message_recipient_auto_complete', 'http://www.example.com/auto_complete_for_message_recipient', {})\n//]]>\n</script>),
       text_field_with_auto_complete(:message, :recipient, {}, :skip_style => true)
   end

data/test/template/javascript_helper_test.rb

@@ -19,6 +19,7 @@ class JavaScriptHelperTest < Test::Unit::TestCase
 
   def test_escape_javascript
     assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
+    assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
   end
                                       
   def test_link_to_function
@@ -31,8 +32,36 @@ class JavaScriptHelperTest < Test::Unit::TestCase
       link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
   end
 
+  def test_link_to_function_with_rjs_block
+    html = link_to_function( "Greet me!" ) do |page|
+      page.replace_html 'header', "<h1>Greetings</h1>"
+    end
+    assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+  end
+
+  def test_link_to_function_with_rjs_block_and_options
+    html = link_to_function( "Greet me!", :class => "updater" ) do |page|
+      page.replace_html 'header', "<h1>Greetings</h1>"
+    end
+    assert_dom_equal %(<a href="#" class="updater" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+  end
+
   def test_button_to_function
     assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />), 
       button_to_function("Greeting", "alert('Hello world!')")
   end
+
+  def test_button_to_function_with_rjs_block
+    html = button_to_function( "Greet me!" ) do |page|
+      page.replace_html 'header', "<h1>Greetings</h1>"
+    end
+    assert_dom_equal %(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+  end
+
+  def test_button_to_function_with_rjs_block_and_options
+    html = button_to_function( "Greet me!", :class => "greeter" ) do |page|
+      page.replace_html 'header', "<h1>Greetings</h1>"
+    end
+    assert_dom_equal %(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+  end
 end

data/test/template/number_helper_test.rb

@@ -1,18 +1,22 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/number_helper'
-require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/hash' # for stringify_keys
-require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/numeric'  # for human_size
 
 class NumberHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::NumberHelper
-  include ActiveSupport::CoreExtensions::Hash
 
   def test_number_to_phone
-    assert_equal("123-555-1234", number_to_phone(1235551234))
-    assert_equal("(123) 555-1234", number_to_phone(1235551234, {:area_code => true}))
-    assert_equal("123 555 1234", number_to_phone(1235551234, {:delimiter => " "}))
-    assert_equal("(123) 555-1234 x 555", number_to_phone(1235551234, {:area_code => true, :extension => 555}))
-    assert_equal("123-555-1234", number_to_phone(1235551234, :extension => "   "))
+    assert_equal("800-555-1212", number_to_phone(8005551212))
+    assert_equal("(800) 555-1212", number_to_phone(8005551212, {:area_code => true}))
+    assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "}))
+    assert_equal("(800) 555-1212 x 123", number_to_phone(8005551212, {:area_code => true, :extension => 123}))
+    assert_equal("800-555-1212", number_to_phone(8005551212, :extension => "  "))
+    assert_equal("800-555-1212", number_to_phone("8005551212"))
+    assert_equal("+1-800-555-1212", number_to_phone(8005551212, :country_code => 1))
+    assert_equal("+18005551212", number_to_phone(8005551212, :country_code => 1, :delimiter => ''))
+    assert_equal("22-555-1212", number_to_phone(225551212))
+    assert_equal("+45-22-555-1212", number_to_phone(225551212, :country_code => 45))
+    assert_equal("x", number_to_phone("x"))
+    assert_nil number_to_phone(nil)
   end
 
   def test_number_to_currency
@@ -21,36 +25,68 @@ class NumberHelperTest < Test::Unit::TestCase
     assert_equal("$1,234,567,890", number_to_currency(1234567890.50, {:precision => 0}))
     assert_equal("$1,234,567,890.5", number_to_currency(1234567890.50, {:precision => 1}))
     assert_equal("&pound;1234567890,50", number_to_currency(1234567890.50, {:unit => "&pound;", :separator => ",", :delimiter => ""}))
+    assert_equal("$1,234,567,890.50", number_to_currency("1234567890.50"))
+    assert_equal("$x.", number_to_currency("x"))
+    assert_nil number_to_currency(nil)
   end
 
   def test_number_to_percentage
     assert_equal("100.000%", number_to_percentage(100))
     assert_equal("100%", number_to_percentage(100, {:precision => 0}))
     assert_equal("302.06%", number_to_percentage(302.0574, {:precision => 2}))
+    assert_equal("100.000%", number_to_percentage("100"))
+    assert_equal("x%", number_to_percentage("x"))
+    assert_nil number_to_percentage(nil)
   end
 
   def test_number_with_delimiter
     assert_equal("12,345,678", number_with_delimiter(12345678))
+    assert_equal("0", number_with_delimiter(0))
+    assert_equal("123", number_with_delimiter(123))
+    assert_equal("123,456", number_with_delimiter(123456))
+    assert_equal("123,456.78", number_with_delimiter(123456.78))
+    assert_equal("123,456.789", number_with_delimiter(123456.789))
+    assert_equal("123,456.78901", number_with_delimiter(123456.78901))
+    assert_equal("123,456,789.78901", number_with_delimiter(123456789.78901))
+    assert_equal("0.78901", number_with_delimiter(0.78901))
+    assert_equal("123,456.78", number_with_delimiter("123456.78"))
+    assert_equal("x", number_with_delimiter("x"))
+    assert_nil number_with_delimiter(nil)
   end
-
-  def test_number_to_human_size
-    assert_equal '0 Bytes',   human_size(0)
-    assert_equal '3 Bytes',   human_size(3.14159265)
-    assert_equal '123 Bytes', human_size(123.0)
-    assert_equal '123 Bytes', human_size(123)
-    assert_equal '1.2 KB',    human_size(1234)
-    assert_equal '12.1 KB',   human_size(12345)
-    assert_equal '1.2 MB',    human_size(1234567)
-    assert_equal '1.1 GB',    human_size(1234567890)
-    assert_equal '1.1 TB',    human_size(1234567890123)
-    assert_equal '444 KB',    human_size(444.kilobytes)
-    assert_equal '1023 MB',   human_size(1023.megabytes)
-    assert_equal '3 TB',      human_size(3.terabytes)
-    assert_nil human_size('x')
-    assert_nil human_size(nil)
-  end
-
+  
   def test_number_with_precision
     assert_equal("111.235", number_with_precision(111.2346))
+    assert_equal("111.23", number_with_precision(111.2346, 2))
+    assert_equal("111.00", number_with_precision(111, 2))
+    assert_equal("111.235", number_with_precision("111.2346"))
+    assert_equal("x", number_with_precision("x"))
+    assert_nil number_with_precision(nil)
+  end
+  
+  def test_number_to_human_size
+    assert_equal '0 Bytes',   number_to_human_size(0)
+    assert_equal '1 Byte',    number_to_human_size(1)
+    assert_equal '3 Bytes',   number_to_human_size(3.14159265)
+    assert_equal '123 Bytes', number_to_human_size(123.0)
+    assert_equal '123 Bytes', number_to_human_size(123)
+    assert_equal '1.2 KB',    number_to_human_size(1234)
+    assert_equal '12.1 KB',   number_to_human_size(12345)
+    assert_equal '1.2 MB',    number_to_human_size(1234567)
+    assert_equal '1.1 GB',    number_to_human_size(1234567890)
+    assert_equal '1.1 TB',    number_to_human_size(1234567890123)
+    assert_equal '444 KB',    number_to_human_size(444.kilobytes)
+    assert_equal '1023 MB',   number_to_human_size(1023.megabytes)
+    assert_equal '3 TB',      number_to_human_size(3.terabytes)
+    assert_equal '1.18 MB',   number_to_human_size(1234567, 2)
+    assert_equal '3 Bytes',   number_to_human_size(3.14159265, 4)
+    assert_equal("123 Bytes", number_to_human_size("123"))
+    assert_nil number_to_human_size('x')
+    assert_nil number_to_human_size(nil)
+  end
+  
+  def test_human_size_alias_is_deprecated
+    assert_deprecated 'human_size' do
+      assert_equal '0 Bytes', human_size(0)
+    end
   end
 end