actionpack 2.0.5 → 2.1.0

data/test/template/form_options_helper_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
 class MockTimeZone
   attr_reader :name
@@ -22,15 +22,15 @@ end
 
 ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
 
-class FormOptionsHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::FormOptionsHelper
+class FormOptionsHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::FormOptionsHelper
 
   silence_warnings do
     Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
     Continent = Struct.new('Continent', :continent_name, :countries)
     Country   = Struct.new('Country', :country_id, :country_name)
     Firm      = Struct.new('Firm', :time_zone)
+    Album     = Struct.new('Album', :id, :title, :genre)
   end
 
   def test_collection_options
@@ -109,19 +109,18 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       )
   end
 
-  # FIXME: fails on Ruby 1.9, probably in html-scanner
   def test_hash_options_for_select
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" })
+      options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
     )
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar")
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
     )
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ])
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
     )
   end
 
@@ -306,6 +305,18 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
     )
   end
+  
+  def test_select_with_index_option
+    @album = Album.new
+    @album.id = 1
+    
+    expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
+
+    assert_dom_equal(
+      expected, 
+      select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
+    )
+  end
 
   def test_select_with_selected_nil
     @post = Post.new

data/test/template/form_tag_helper_test.rb

@@ -1,11 +1,7 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require '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
+class FormTagHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::FormTagHelper
 
   def setup
     @controller = Class.new do
@@ -221,11 +217,18 @@ class FormTagHelperTest < Test::Unit::TestCase
 
   def test_submit_tag
     assert_dom_equal(
-      %(<input name='commit' type='submit' value='Save' onclick="this.setAttribute('originalValue', this.value);this.disabled=true;this.value='Saving...';alert('hello!');result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false };return result" />),
+      %(<input name='commit' type='submit' value='Save' onclick="this.setAttribute('originalValue', this.value);this.disabled=true;this.value='Saving...';alert('hello!');result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false };return result;" />),
       submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')")
     )
   end
 
+  def test_submit_tag_with_confirmation
+    assert_dom_equal(
+      %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),
+      submit_tag("Save", :confirm => "Are you sure?")
+    )
+  end
+  
   def test_pass
     assert_equal 1, 1
   end

data/test/template/javascript_helper_test.rb

@@ -1,13 +1,7 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
-class JavaScriptHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::JavaScriptHelper
-
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::CaptureHelper
+class JavaScriptHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::JavaScriptHelper
 
   def test_define_javascript_functions
     # check if prototype.js is included first

data/test/template/number_helper_test.rb

@@ -1,7 +1,7 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
-class NumberHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::NumberHelper
+class NumberHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::NumberHelper
 
   def test_number_to_phone
     assert_equal("800-555-1212", number_to_phone(8005551212))
@@ -25,6 +25,7 @@ class NumberHelperTest < Test::Unit::TestCase
     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("1,234,567,890.50 K&#269;", number_to_currency("1234567890.50", {:unit => "K&#269;", :format => "%n %u"}))
     assert_equal("$x.", number_to_currency("x"))
     assert_nil number_to_currency(nil)
   end
@@ -55,9 +56,11 @@ class NumberHelperTest < Test::Unit::TestCase
 
   def test_number_with_precision
     assert_equal("111.235", number_with_precision(111.2346))
+    assert_equal("31.83", number_with_precision(31.825, 2))    
     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("31.83", number_with_precision("31.825", 2))
     assert_equal("112", number_with_precision(111.50, 0))
     assert_equal("1234567892", number_with_precision(1234567891.50, 0))
 

data/test/template/prototype_helper_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
 Bunny = Struct.new(:Bunny, :id)
 
@@ -24,24 +24,9 @@ end
 class Author::Nested < Author; end
 
 
-module BaseTest
-  def self.included(base)
-    base.send :attr_accessor, :template_format
-  end
+class PrototypeHelperBaseTest < ActionView::TestCase
+  attr_accessor :template_format
 
-  include ActionView::Helpers::JavaScriptHelper
-  include ActionView::Helpers::PrototypeHelper
-  include ActionView::Helpers::ScriptaculousHelper
-  
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::FormTagHelper
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::CaptureHelper
-  include ActionView::Helpers::RecordIdentificationHelper
-  include ActionController::PolymorphicRoutes
-  
   def setup
     @template = nil
     @controller = Class.new do
@@ -59,25 +44,22 @@ module BaseTest
     end.new
   end
 
-protected
-  
-  def request_forgery_protection_token
-    nil
-  end
-  
-  def protect_against_forgery?
-    false
-  end
-  
-  def create_generator
-    block = Proc.new { |*args| yield *args if block_given? } 
-    JavaScriptGenerator.new self, &block
-  end
+  protected
+    def request_forgery_protection_token
+      nil
+    end
+
+    def protect_against_forgery?
+      false
+    end
+
+    def create_generator
+      block = Proc.new { |*args| yield *args if block_given? } 
+      JavaScriptGenerator.new self, &block
+    end
 end
 
-class PrototypeHelperTest < Test::Unit::TestCase
-  include BaseTest
-  
+class PrototypeHelperTest < PrototypeHelperBaseTest
   def setup
     @record = @author = Author.new
     @article = Article.new
@@ -102,6 +84,11 @@ class PrototypeHelperTest < Test::Unit::TestCase
       link_to_remote("Remote outauthor", { :url => { :action => "whatnot"  }, :html => { :class => "fine" } })
   end
   
+  def test_link_to_remote_url_quote_escaping
+    assert_dom_equal %(<a href="#" onclick="new Ajax.Request('http://www.example.com/whatnot\\\'s', {asynchronous:true, evalScripts:true}); return false;">Remote</a>),
+      link_to_remote("Remote", { :url => { :action => "whatnot's" } })
+  end
+
   def test_periodically_call_remote
     assert_dom_equal %(<script type="text/javascript">\n//<![CDATA[\nnew PeriodicalExecuter(function() {new Ajax.Updater('schremser_bier', 'http://www.example.com/mehr_bier', {asynchronous:true, evalScripts:true})}, 10)\n//]]>\n</script>),
       periodically_call_remote(:update => "schremser_bier", :url => { :action => "mehr_bier" })
@@ -230,9 +217,9 @@ class PrototypeHelperTest < Test::Unit::TestCase
   end
   
   def test_observe_field_using_with_option
-    expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:'id=' + value})})\n//]]>\n</script>)
+    expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(value)})})\n//]]>\n</script>)
     assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => 'id')
-    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "'id=' + value")
+    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "'id=' + encodeURIComponent(value)")
   end
   
   def test_observe_field_using_json_in_with_option
@@ -294,9 +281,7 @@ class PrototypeHelperTest < Test::Unit::TestCase
     end
 end
 
-class JavaScriptGeneratorTest < Test::Unit::TestCase
-  include BaseTest
-  
+class JavaScriptGeneratorTest < PrototypeHelperBaseTest
   def setup
     super
     @generator = create_generator
@@ -358,6 +343,8 @@ class JavaScriptGeneratorTest < Test::Unit::TestCase
   def test_redirect_to
     assert_equal 'window.location.href = "http://www.example.com/welcome";',
       @generator.redirect_to(:action => 'welcome')
+    assert_equal 'window.location.href = "http://www.example.com/welcome?a=b&c=d";',
+      @generator.redirect_to("http://www.example.com/welcome?a=b&c=d")
   end
   
   def test_delay

data/test/template/record_tag_helper_test.rb

@@ -0,0 +1,54 @@
+require 'abstract_unit'
+
+class Post
+  def id
+     45 
+  end
+  def body
+    "What a wonderful world!"
+  end
+end
+
+class RecordTagHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::RecordTagHelper
+
+  def setup
+    @post = Post.new
+  end
+  
+  def test_content_tag_for
+    _erbout = ''
+    expected = %(<li class="post bar" id="post_45"></li>)
+    actual = content_tag_for(:li, @post, :class => 'bar') { }
+    assert_dom_equal expected, actual
+  end
+  
+  def test_content_tag_for_prefix
+    _erbout = ''
+    expected = %(<ul class="post" id="archived_post_45"></ul>)
+    actual = content_tag_for(:ul, @post, :archived) { }
+    assert_dom_equal expected, actual    
+  end
+  
+  def test_content_tag_for_with_extra_html_tags
+    _erbout = ''
+    expected = %(<tr class="post bar" id="post_45" style='background-color: #f0f0f0'></tr>)
+    actual = content_tag_for(:tr, @post, {:class => "bar", :style => "background-color: #f0f0f0"}) { }
+    assert_dom_equal expected, actual        
+  end
+  
+  def test_block_works_with_content_tag_for
+    _erbout = ''
+    expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
+    actual = content_tag_for(:tr, @post) { _erbout.concat @post.body }
+    assert_dom_equal expected, actual            
+  end
+  
+  def test_div_for    
+    _erbout = ''    
+    expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
+    actual = div_for(@post, :class => "bar") { _erbout.concat @post.body }
+    assert_dom_equal expected, actual
+  end  
+  
+end

data/test/template/sanitize_helper_test.rb

@@ -1,11 +1,10 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
-require "#{File.dirname(__FILE__)}/../testing_sandbox"
+require 'abstract_unit'
+require 'testing_sandbox'
 
 # The exhaustive tests are in test/controller/html/sanitizer_test.rb.
 # This tests the that the helpers hook up correctly to the sanitizer classes.
-class SanitizeHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::SanitizeHelper
-  include ActionView::Helpers::TagHelper
+class SanitizeHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::SanitizeHelper
   include TestingSandbox
 
   def test_strip_links
@@ -46,4 +45,4 @@ class SanitizeHelperTest < Test::Unit::TestCase
   def assert_sanitized(text, expected = nil)
     assert_equal((expected || text), sanitize(text))
   end
-end
+end

data/test/template/scriptaculous_helper_test.rb

@@ -1,16 +1,8 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
+
+class ScriptaculousHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::ScriptaculousHelper
 
-class ScriptaculousHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::JavaScriptHelper
-  include ActionView::Helpers::PrototypeHelper
-  include ActionView::Helpers::ScriptaculousHelper
-  
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::CaptureHelper
-  
   def setup
     @controller = Class.new do
       def url_for(options)
@@ -88,8 +80,10 @@ class ScriptaculousHelperTest < Test::Unit::TestCase
       drop_receiving_element("droptarget1", :accept => 'products', :update => 'infobox')
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:['tshirts','mugs'], onDrop:function(element){new Ajax.Updater('infobox', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
       drop_receiving_element("droptarget1", :accept => ['tshirts','mugs'], :update => 'infobox')
-  end
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add("droptarget1", {hoverclass:'dropready', onDrop:function(element){if (confirm('Are you sure?')) { new Ajax.Request('http://www.example.com/update_drop', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)}); }}})\n//]]>\n</script>),
+    drop_receiving_element('droptarget1', :hoverclass=>'dropready', :url=>{:action=>'update_drop'}, :confirm => 'Are you sure?')
 
+  end
   def protect_against_forgery?
     false
   end

data/test/template/tag_helper_test.rb

@@ -1,10 +1,7 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
-class TagHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::CaptureHelper
+class TagHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::TagHelper
 
   def test_tag
     assert_equal "<br />", tag("br")

data/test/template/template_finder_test.rb

@@ -0,0 +1,73 @@
+require 'abstract_unit'
+
+class TemplateFinderTest < Test::Unit::TestCase
+
+  LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
+
+  def setup
+    ActionView::TemplateFinder.process_view_paths(LOAD_PATH_ROOT)
+    ActionView::Template::register_template_handler :mab, Class.new(ActionView::TemplateHandler)
+    @template = ActionView::Base.new
+    @finder = ActionView::TemplateFinder.new(@template, LOAD_PATH_ROOT)
+  end
+
+  def test_should_raise_exception_for_unprocessed_view_path
+    assert_raises ActionView::TemplateFinder::InvalidViewPath do
+      ActionView::TemplateFinder.new(@template, File.dirname(__FILE__))
+    end
+  end
+
+  def test_should_cache_file_extension_properly
+    assert_equal ["builder", "erb", "rhtml", "rjs", "rxml", "mab"].sort,
+                 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort
+
+    assert_equal (Dir.glob("#{LOAD_PATH_ROOT}/**/*/*.{erb,rjs,rhtml,builder,rxml,mab}") |
+                  Dir.glob("#{LOAD_PATH_ROOT}/**.{erb,rjs,rhtml,builder,rxml,mab}")).size,
+                 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].keys.size
+  end
+
+  def test_should_cache_dir_content_properly
+    assert ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT]
+    assert_equal (Dir.glob("#{LOAD_PATH_ROOT}/**/*/**") | 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
+      ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky")
+      ActionView::Template::register_template_handler :funky, Class.new(ActionView::TemplateHandler)
+    end
+  end
+end