actionpack 1.12.5 → 1.13.0

data/test/controller/verification_test.rb

@@ -3,13 +3,14 @@ require File.dirname(__FILE__) + '/../abstract_unit'
 class VerificationTest < Test::Unit::TestCase
   class TestController < ActionController::Base
     verify :only => :guarded_one, :params => "one",
+           :add_flash => { :error => 'unguarded' },
            :redirect_to => { :action => "unguarded" }
 
     verify :only => :guarded_two, :params => %w( one two ),
            :redirect_to => { :action => "unguarded" }
 
     verify :only => :guarded_with_flash, :params => "one",
-           :add_flash => { "notice" => "prereqs failed" },
+           :add_flash => { :notice => "prereqs failed" },
            :redirect_to => { :action => "unguarded" }
 
     verify :only => :guarded_in_session, :session => "one",
@@ -31,46 +32,46 @@ class VerificationTest < Test::Unit::TestCase
     verify :only => :two_redirects, :method => :post,
            :redirect_to => { :action => "unguarded" }
 
-    verify :only => :must_be_post, :method => :post, :render => { :status => 500, :text => "Must be post"}
+    verify :only => :must_be_post, :method => :post, :render => { :status => 405, :text => "Must be post" }, :add_headers => { "Allow" => "POST" }
 
     def guarded_one
-      render :text => "#{@params["one"]}"
+      render :text => "#{params[:one]}"
     end
 
     def guarded_with_flash
-      render :text => "#{@params["one"]}"
+      render :text => "#{params[:one]}"
     end
 
     def guarded_two
-      render :text => "#{@params["one"]}:#{@params["two"]}"
+      render :text => "#{params[:one]}:#{params[:two]}"
     end
 
     def guarded_in_session
-      render :text => "#{@session["one"]}"
+      render :text => "#{session["one"]}"
     end
 
     def multi_one
-      render :text => "#{@session["one"]}:#{@session["two"]}"
+      render :text => "#{session["one"]}:#{session["two"]}"
     end
 
     def multi_two
-      render :text => "#{@session["two"]}:#{@session["one"]}"
+      render :text => "#{session["two"]}:#{session["one"]}"
     end
 
     def guarded_by_method
-      render :text => "#{@request.method}"
+      render :text => "#{request.method}"
     end
     
     def guarded_by_xhr
-      render :text => "#{@request.xhr?}"
+      render :text => "#{request.xhr?}"
     end
     
     def guarded_by_not_xhr
-      render :text => "#{@request.xhr?}"
+      render :text => "#{request.xhr?}"
     end
 
     def unguarded
-      render :text => "#{@params["one"]}"
+      render :text => "#{params[:one]}"
     end
 
     def two_redirects
@@ -103,18 +104,19 @@ class VerificationTest < Test::Unit::TestCase
   def test_guarded_one_without_prereqs
     get :guarded_one
     assert_redirected_to :action => "unguarded"
+    assert_equal 'unguarded', flash[:error]
   end
 
   def test_guarded_with_flash_with_prereqs
     get :guarded_with_flash, :one => "here"
     assert_equal "here", @response.body
-    assert_flash_empty
+    assert flash.empty?
   end
 
   def test_guarded_with_flash_without_prereqs
     get :guarded_with_flash
     assert_redirected_to :action => "unguarded"
-    assert_flash_equal "prereqs failed", "notice"
+    assert_equal "prereqs failed", flash[:notice]
   end
 
   def test_guarded_two_with_prereqs
@@ -212,13 +214,13 @@ class VerificationTest < Test::Unit::TestCase
     assert_equal "Was a post!", @response.body
   end
     
-  def test_guarded_post_and_calls_render_fails
+  def test_guarded_post_and_calls_render_fails_and_sets_allow_header
     get :must_be_post
-    assert_response 500
+    assert_response 405
     assert_equal "Must be post", @response.body
+    assert_equal "POST", @response.headers["Allow"]
   end
   
-
   def test_second_redirect
     assert_nothing_raised { get :two_redirects }
   end

data/test/controller/webservice_test.rb

@@ -148,13 +148,6 @@ class WebServiceTest < Test::Unit::TestCase
     assert_equal %(<foo "bar's" & friends>), @controller.params[:data]
   end
 
-  def test_dasherized_keys_as_yaml
-    ActionController::Base.param_parsers[Mime::YAML] = :yaml
-    process('POST', 'application/x-yaml', "---\nfirst-key:\n  sub-key: ...\n", true)
-    assert_equal 'action, controller, first_key(sub_key), full', @controller.response.body
-    assert_equal "...", @controller.params[:first_key][:sub_key]
-  end
-
   def test_typecast_as_yaml
     ActionController::Base.param_parsers[Mime::YAML] = :yaml
     process('POST', 'application/x-yaml', <<-YAML)

data/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml

@@ -0,0 +1 @@
+<hello>world</hello>

data/test/fixtures/content_type/render_default_for_rhtml.rhtml

@@ -0,0 +1 @@
+<%= 'hello world!' %>

data/test/fixtures/content_type/render_default_for_rjs.rjs

@@ -0,0 +1 @@
+page.alert 'hello world!'

data/test/fixtures/content_type/render_default_for_rxml.rxml

@@ -0,0 +1 @@
+xml.p "Hello world!"

data/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml

@@ -0,0 +1 @@
+<%= @cookies[:test] %>

data/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml

@@ -0,0 +1 @@
+<%= cookies[:test] %>

data/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml

@@ -0,0 +1 @@
+<%= @flash[:test] %>

data/test/fixtures/deprecated_instance_variables/_flash_method.rhtml

@@ -0,0 +1 @@
+<%= flash[:test] %>

data/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml

@@ -0,0 +1 @@
+<%= @headers[:test] %>

data/test/fixtures/deprecated_instance_variables/_headers_method.rhtml

@@ -0,0 +1 @@
+<%= headers[:test] %>

data/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml

@@ -0,0 +1 @@
+<%= @params[:test] %>

data/test/fixtures/deprecated_instance_variables/_params_method.rhtml

@@ -0,0 +1 @@
+<%= params[:test] %>

data/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml

@@ -0,0 +1 @@
+<%= @request.method %>

data/test/fixtures/deprecated_instance_variables/_request_method.rhtml

@@ -0,0 +1 @@
+<%= request.method %>

data/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml

@@ -0,0 +1 @@
+<%= @response.body %>

data/test/fixtures/deprecated_instance_variables/_response_method.rhtml

@@ -0,0 +1 @@
+<%= response.body %>

data/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml

@@ -0,0 +1 @@
+<%= @session[:test] %>

data/test/fixtures/deprecated_instance_variables/_session_method.rhtml

@@ -0,0 +1 @@
+<%= session[:test] %>

data/test/fixtures/public/javascripts/application.js

@@ -0,0 +1 @@
+# Test file for javascript_include_tag

data/test/fixtures/test/_hello.rxml

@@ -0,0 +1 @@
+xm.hello

data/test/fixtures/test/hello_world_container.rxml

@@ -0,0 +1,3 @@
+xml.test do
+  render :partial => 'hello', :locals => { :xm => xml }
+end

data/test/fixtures/topic.rb

@@ -1,3 +1,3 @@
 class Topic < ActiveRecord::Base
-  has_many :replies, :include => [:user], :dependent => true
-end
+  has_many :replies, :include => [:user], :dependent => :destroy
+end

data/test/template/active_record_helper_test.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_helper'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/text_helper'
@@ -22,10 +22,16 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
       alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
       alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
     end
+    
+    User = Struct.new("User", :email)
+    User.class_eval do
+      alias_method :email_before_type_cast, :email unless respond_to?(:email_before_type_cast)
+    end
+    
     Column = Struct.new("Column", :type, :name, :human_name)
   end
 
-  def setup
+  def setup_post
     @post = Post.new    
     def @post.errors
       Class.new {
@@ -43,13 +49,45 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
       Post.content_columns.select { |column| column.name == attr_name }.first
     end
 
-    def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
+    silence_warnings do
+      def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
+    end
 
     @post.title       = "Hello World"
     @post.author_name = ""
     @post.body        = "Back to the hill and over it again!"
     @post.secret = 1
     @post.written_on  = Date.new(2004, 6, 15)
+  end
+  
+  def setup_user
+    @user = User.new    
+    def @user.errors
+      Class.new {
+        def on(field) field == "email" end
+        def empty?() false end 
+        def count() 1 end 
+        def full_messages() [ "User email can't be empty" ] end
+      }.new
+    end
+    
+    def @user.new_record?() true end
+    def @user.to_param() nil end
+
+    def @user.column_for_attribute(attr_name)
+      User.content_columns.select { |column| column.name == attr_name }.first
+    end
+
+    silence_warnings do
+      def User.content_columns() [ Column.new(:string, "email", "Email") ] end
+    end
+
+    @user.email = ""
+  end
+
+  def setup
+    setup_post
+    setup_user
 
     @controller = Object.new
     def @controller.url_for(options, *parameters_for_method_reference)
@@ -85,11 +123,14 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
       form("post")
     )
 
-    class << @post
-      def new_record?() false end
-      def to_param() id end
-      def id() 1 end
+    silence_warnings do
+      class << @post
+        def new_record?() false end
+        def to_param() id end
+        def id() 1 end
+      end
     end
+
     assert_dom_equal(
       %(<form action="update/1" method="post"><input id="post_id" name="post[id]" type="hidden" value="1" /><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Update" /></form>),
       form("post")
@@ -97,20 +138,24 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
   end
   
   def test_form_with_date
-    def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
+    silence_warnings do
+      def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
+    end
 
     assert_dom_equal(
-      %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
+      %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select id="post_written_on_1i" name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select id="post_written_on_2i" name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="post_written_on_3i" name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
       form("post")
     )
   end
-  
+
   def test_form_with_datetime
-    def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
+    silence_warnings do
+      def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
+    end
     @post.written_on  = Time.gm(2004, 6, 15, 16, 30)
 
     assert_dom_equal(
-      %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n &mdash; <select name="post[written_on(4i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select name="post[written_on(5i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30" selected="selected">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
+      %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select id="post_written_on_1i" name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select id="post_written_on_2i" name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="post_written_on_3i" name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n &mdash; <select id="post_written_on_4i" name="post[written_on(4i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_written_on_5i" name="post[written_on(5i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30" selected="selected">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
       form("post")
     )
   end
@@ -118,11 +163,37 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
   def test_error_for_block
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post")
     assert_equal %(<div class="errorDeathByClass" id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => "errorDeathById", :header_tag => "h1")
+    assert_equal %(<div id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => nil, :id => "errorDeathById", :header_tag => "h1")
+    assert_equal %(<div class="errorDeathByClass"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => nil, :header_tag => "h1")
   end
   
   def test_error_messages_for_handles_nil
     assert_equal "", error_messages_for("notthere")
   end
+  
+  def test_error_message_on_handles_nil
+    assert_equal "", error_message_on("notthere", "notthere")
+  end
+  
+  def test_error_message_on
+    assert error_message_on(:post, :author_name)
+  end
+  
+  def test_error_messages_for_many_objects
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>), error_messages_for("post", "user")
+
+    # reverse the order, error order changes and so does the title
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post")
+
+    # add the default to put post back in the title
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post", :object_name => "post")
+    
+    # symbols work as well
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => :post)
+    
+    # any default works too
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this monkey from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => "monkey")
+  end
 
   def test_form_with_string_multipart
     assert_dom_equal(

data/test/template/asset_tag_helper_test.rb

@@ -34,6 +34,7 @@ class AssetTagHelperTest < Test::Unit::TestCase
 
   AutoDiscoveryToTag = {
     %(auto_discovery_link_tag) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:rss)) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
     %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
@@ -47,11 +48,13 @@ class AssetTagHelperTest < Test::Unit::TestCase
 
   JavascriptPathToTag = {
     %(javascript_path("xmlhr")) => %(/javascripts/xmlhr.js),
-    %(javascript_path("super/xmlhr")) => %(/javascripts/super/xmlhr.js)
+    %(javascript_path("super/xmlhr")) => %(/javascripts/super/xmlhr.js),
+    %(javascript_path("/super/xmlhr.js")) => %(/super/xmlhr.js)
   }
 
   JavascriptIncludeToTag = {
     %(javascript_include_tag("xmlhr")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
+    %(javascript_include_tag("xmlhr.js")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
     %(javascript_include_tag("xmlhr", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/xmlhr.js" type="text/javascript"></script>),
     %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>),
     %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>),
@@ -61,31 +64,44 @@ class AssetTagHelperTest < Test::Unit::TestCase
 
   StylePathToTag = {
     %(stylesheet_path("style")) => %(/stylesheets/style.css),
+    %(stylesheet_path("style.css")) => %(/stylesheets/style.css),
     %(stylesheet_path('dir/file')) => %(/stylesheets/dir/file.css),
-    %(stylesheet_path('/dir/file')) => %(/dir/file.css)
+    %(stylesheet_path('/dir/file.rcss')) => %(/dir/file.rcss)
   }
 
   StyleLinkToTag = {
     %(stylesheet_link_tag("style")) => %(<link href="/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("style.css")) => %(<link href="/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
     %(stylesheet_link_tag("/dir/file")) => %(<link href="/dir/file.css" media="screen" rel="Stylesheet" type="text/css" />),
     %(stylesheet_link_tag("dir/file")) => %(<link href="/stylesheets/dir/file.css" media="screen" rel="Stylesheet" type="text/css" />),
     %(stylesheet_link_tag("style", :media => "all")) => %(<link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />)
+    %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="Stylesheet" type="text/css" />)
   }
 
   ImagePathToTag = {
-    %(image_path("xml")) => %(/images/xml.png),
+    %(image_path("xml.png")) => %(/images/xml.png),
+    %(image_path("dir/xml.png")) => %(/images/dir/xml.png),
+    %(image_path("/dir/xml.png")) => %(/dir/xml.png)    
   }
 
   ImageLinkToTag = {
-    %(image_tag("xml")) => %(<img alt="Xml" src="/images/xml.png" />),
-    %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.png" />),
-    %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
-    %(image_tag("symbolize", "size" => "45x70")) => %(<img alt="Symbolize" height="70" src="/images/symbolize.png" width="45" />),
-    %(image_tag("http://www.rubyonrails.com/images/rails")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />)
+    %(image_tag("xml.png")) => %(<img alt="Xml" src="/images/xml.png" />),
+    %(image_tag("rss.gif", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.gif" />),
+    %(image_tag("gold.png", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
+    %(image_tag("gold.png", "size" => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
+    %(image_tag("error.png", "size" => "45")) => %(<img alt="Error" src="/images/error.png" />),
+    %(image_tag("error.png", "size" => "45 x 70")) => %(<img alt="Error" src="/images/error.png" />),
+    %(image_tag("error.png", "size" => "x")) => %(<img alt="Error" src="/images/error.png" />),
+    %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />)
   }
 
-  def test_auto_discovery
+  DeprecatedImagePathToTag = {
+    %(image_path("xml")) => %(/images/xml.png)
+  }
+
+
+  def test_auto_discovery_link_tag
     AutoDiscoveryToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
@@ -93,8 +109,12 @@ class AssetTagHelperTest < Test::Unit::TestCase
     JavascriptPathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
-  def test_javascript_include
+  def test_javascript_include_tag
     JavascriptIncludeToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+    
+    Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + "/../fixtures/")
+    ENV["RAILS_ASSET_ID"] = "1"    
+    assert_dom_equal(%(<script src="/javascripts/prototype.js?1" type="text/javascript"></script>\n<script src="/javascripts/effects.js?1" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js?1" type="text/javascript"></script>\n<script src="/javascripts/controls.js?1" type="text/javascript"></script>\n<script src="/javascripts/application.js?1" type="text/javascript"></script>), javascript_include_tag(:defaults))
   end
   
   def test_register_javascript_include_default
@@ -104,38 +124,57 @@ class AssetTagHelperTest < Test::Unit::TestCase
     assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/slider.js" type="text/javascript"></script>\n<script src="/javascripts/lib1.js" type="text/javascript"></script>\n<script src="/elsewhere/blub/lib2.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
   end
   
-  def test_style_path
+  def test_stylesheet_path
     StylePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
-  def test_style_link
+  def test_stylesheet_link_tag
     StyleLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
   def test_image_path
     ImagePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
-
+  
   def test_image_tag
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
   
+  def test_should_deprecate_image_filename_with_no_extension
+    DeprecatedImagePathToTag.each do |method, tag| 
+      assert_deprecated("image_path") { assert_dom_equal(tag, eval(method)) }
+    end
+  end
+  
   def test_timebased_asset_id
     Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + "/../fixtures/")
     expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
-  def test_skipping_asset_id_on_complete_url
+  def test_should_skip_asset_id_on_complete_url
     Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + "/../fixtures/")
     assert_equal %(<img alt="Rails" src="http://www.example.com/rails.png" />), image_tag("http://www.example.com/rails.png")
   end
   
-  def test_preset_asset_id
+  def test_should_use_preset_asset_id
     Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + "/../fixtures/")
     ENV["RAILS_ASSET_ID"] = "4500"
     assert_equal %(<img alt="Rails" src="/images/rails.png?4500" />), image_tag("rails.png")
   end
+
+  def test_preset_empty_asset_id
+    Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + "/../fixtures/")
+    ENV["RAILS_ASSET_ID"] = ""
+    assert_equal %(<img alt="Rails" src="/images/rails.png" />), image_tag("rails.png")
+  end
+
+  def test_should_not_modify_source_string
+    source = '/images/rails.png'
+    copy = source.dup
+    image_tag(source)
+    assert_equal copy, source
+  end
 end
 
 class AssetTagHelperNonVhostTest < Test::Unit::TestCase
@@ -145,18 +184,16 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
 
   def setup
     @controller = Class.new do
-    
       attr_accessor :request
 
       def url_for(options, *parameters_for_method_reference)
-        "http://www.example.com/calloboration/hieraki"
+        "http://www.example.com/collaboration/hieraki"
       end
-      
     end.new
     
     @request = Class.new do 
       def relative_url_root
-        "/calloboration/hieraki"
+        "/collaboration/hieraki"
       end
     end.new
     
@@ -165,88 +202,31 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
     ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
   end
 
-  AutoDiscoveryToTag = {
-    %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />),
-    %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="ATOM" type="application/atom+xml" />),
-    %(auto_discovery_link_tag) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />),
-  }
-
-  JavascriptPathToTag = {
-    %(javascript_path("xmlhr")) => %(/calloboration/hieraki/javascripts/xmlhr.js),
-  }
-
-  JavascriptIncludeToTag = {
-    %(javascript_include_tag("xmlhr")) => %(<script src="/calloboration/hieraki/javascripts/xmlhr.js" type="text/javascript"></script>),
-    %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/calloboration/hieraki/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/calloboration/hieraki/elsewhere/cools.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:defaults)) => %(<script src="/calloboration/hieraki/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/effects.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/controls.js" type="text/javascript"></script>)
-  }
-
-  StylePathToTag = {
-    %(stylesheet_path("style")) => %(/calloboration/hieraki/stylesheets/style.css),
-  }
-
-  StyleLinkToTag = {
-    %(stylesheet_link_tag("style")) => %(<link href="/calloboration/hieraki/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/calloboration/hieraki/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/calloboration/hieraki/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />)
-  }
-
-  ImagePathToTag = {
-    %(image_path("xml")) => %(/calloboration/hieraki/images/xml.png),
-  }
-  
-  ImageLinkToTag = {
-    %(image_tag("xml")) => %(<img alt="Xml" src="/calloboration/hieraki/images/xml.png" />),
-    %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/calloboration/hieraki/images/rss.png" />),
-    %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />),
-    %(image_tag("http://www.example.com/images/icon.gif")) => %(<img alt="Icon" src="http://www.example.com/images/icon.gif" />),
-    %(image_tag("symbolize", "size" => "45x70")) => %(<img alt="Symbolize" height="70" src="/calloboration/hieraki/images/symbolize.png" width="45" />)
-  }
-
-  def test_auto_discovery
-    AutoDiscoveryToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
-  end
-
-  def test_javascript_path
-    JavascriptPathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
-  end
-
-  def test_javascript_include
-    JavascriptIncludeToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  def test_should_compute_proper_path
+    assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
+    assert_dom_equal(%(/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
+    assert_dom_equal(%(/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
+    assert_dom_equal(%(/collaboration/hieraki/images/xml.png), image_path("xml.png"))
   end
   
-  def test_register_javascript_include_default
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'slider'
-    assert_dom_equal  %(<script src="/calloboration/hieraki/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/effects.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/controls.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/slider.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'lib1', '/elsewhere/blub/lib2'
-    assert_dom_equal  %(<script src="/calloboration/hieraki/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/effects.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/controls.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/slider.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/javascripts/lib1.js" type="text/javascript"></script>\n<script src="/calloboration/hieraki/elsewhere/blub/lib2.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
+  def test_should_ignore_relative_root_path_on_complete_url
+    assert_dom_equal(%(http://www.example.com/images/xml.png), image_path("http://www.example.com/images/xml.png"))
   end
 
-  def test_style_path
-    StylePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
-  end
-
-  def test_style_link
-    StyleLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  def test_should_compute_proper_path_with_asset_host
+    ActionController::Base.asset_host = "http://assets.example.com"
+    assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
+    assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
+    assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
+    assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
+  ensure
+    ActionController::Base.asset_host = ""
   end
 
-  def test_image_path
-    ImagePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
-  end
-  
-  def test_image_tag
-    ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
-    # Assigning a default alt tag should not cause an exception to be raised
-    assert_nothing_raised { image_tag('') }
-  end
-  
-  def test_stylesheet_with_asset_host_already_encoded
-    ActionController::Base.asset_host = "http://foo.example.com"
-    result = stylesheet_link_tag("http://bar.example.com/stylesheets/style.css")
-    assert_dom_equal(
-      %(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
-      result)
+  def test_should_ignore_asset_host_on_complete_url
+    ActionController::Base.asset_host = "http://assets.example.com"
+    assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
   ensure
     ActionController::Base.asset_host = ""
   end
-  
 end