6 files changed, 160 insertions, 76 deletions

diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 28f9d48671..83fc6a282c 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -213,11 +213,11 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_javascript_include_tag_with_missing_source
-    assert_raise(Errno::ENOENT) {
+    assert_nothing_raised {
       javascript_include_tag('missing_security_guard')
     }
 
-    assert_raise(Errno::ENOENT) {
+    assert_nothing_raised {
       javascript_include_tag(:defaults, 'missing_security_guard')
     }
 
@@ -276,7 +276,7 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_stylesheet_link_tag_with_missing_source
-    assert_raise(Errno::ENOENT) {
+    assert_nothing_raised {
       stylesheet_link_tag('missing_security_guard')
     }
 
@@ -639,6 +639,40 @@ class AssetTagHelperTest < ActionView::TestCase
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
 
+  def test_caching_javascript_include_tag_when_caching_on_and_missing_javascript_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.perform_caching = true
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+  end
+
+  def test_caching_javascript_include_tag_when_caching_off_and_missing_javascript_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.perform_caching = false
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+  end
+
   def test_caching_stylesheet_link_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a0.example.com'
@@ -709,7 +743,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on_and_missing_css_file
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_raise(Errno::ENOENT) {
@@ -729,6 +762,27 @@ class AssetTagHelperTest < ActionView::TestCase
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
 
+  def test_caching_stylesheet_link_tag_when_caching_off_and_missing_css_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.perform_caching = false
+
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert ! File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert ! File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+  end
+
   def test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 7734e6da73..632988bb2e 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -14,6 +14,9 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     assert_equal "two", render(:file => "test/render_file_with_locals_and_default.erb", :locals => { :secret => "two" })
   end
 
+  # This is broken in 1.8.6 (not supported in Rails 3.0) because the cache uses a Hash
+  # key. Since Ruby 1.8.6 implements Hash#hash using the hash's object_id, it will never
+  # successfully get a cache hit here.
   def test_template_changes_are_not_reflected_with_cached_templates
     assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     modify_template "test/hello_world.erb", "Goodbye world!" do
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 8fd018f86d..be15b06372 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -784,6 +784,42 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_an_empty_supplied_attributes_collection
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments, []) do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments, @post.comments) do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_nested_fields_for_on_a_nested_attributes_collection_association_yields_only_builder
     @post.comments = [Comment.new(321), Comment.new]
     yielded_comments = []
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index aa40e46aa8..f3cdab05bf 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'tzinfo'
+require 'active_support/vendor/tzinfo'
 
 TZInfo::Timezone.cattr_reader :loaded_zones
 
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index c86d5215cd..3c192906ae 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -33,18 +33,14 @@ module RenderTestCases
   end
 
   def test_render_file_with_localization
-    begin
-      old_locale = I18n.locale
-      I18n.locale = :da
-      assert_equal "Hey verden", @view.render(:file => "test/hello_world")
-    ensure
-      I18n.locale = old_locale
-    end
+    old_locale, I18n.locale = I18n.locale, :da
+    assert_equal "Hey verden", @view.render(:file => "test/hello_world")
+  ensure
+    I18n.locale = old_locale
   end
 
   def test_render_file_with_dashed_locale
-    old_locale = I18n.locale
-    I18n.locale = :"pt-BR"
+    old_locale, I18n.locale = I18n.locale, :"pt-BR"
     assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
   ensure
     I18n.locale = old_locale
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 0e24fbd24d..447d520ef1 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'controller/fake_controllers'
 
 RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
 
@@ -367,25 +368,25 @@ class UrlHelperTest < ActionView::TestCase
   end
 end
 
-class UrlHelperWithControllerTest < ActionView::TestCase
-  class UrlHelperController < ActionController::Base
-    def self.controller_path; 'url_helper_with_controller' end
-
-    def show_url_for
-      render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
-    end
+class UrlHelperController < ActionController::Base
+  def self.controller_path; 'url_helper_with_controller' end
 
-    def show_named_route
-      render :inline => "<%= show_named_route_#{params[:kind]} %>"
-    end
+  def show_url_for
+    render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
+  end
 
-    def nil_url_for
-      render :inline => '<%= url_for(nil) %>'
-    end
+  def show_named_route
+    render :inline => "<%= show_named_route_#{params[:kind]} %>"
+  end
 
-    def rescue_action(e) raise e end
+  def nil_url_for
+    render :inline => '<%= url_for(nil) %>'
   end
 
+  def rescue_action(e) raise e end
+end
+
+class UrlHelperWithControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
@@ -416,7 +417,7 @@ class UrlHelperWithControllerTest < ActionView::TestCase
 
   def test_url_for_nil_returns_current_path
     get :nil_url_for
-    assert_equal '/url_helper_with_controller/nil_url_for', @response.body
+    assert_equal '/url_helper/nil_url_for', @response.body
   end
 
   def test_named_route_should_show_host_and_path_using_controller_default_url_options
@@ -436,35 +437,33 @@ class UrlHelperWithControllerTest < ActionView::TestCase
     def with_url_helper_routing
       with_routing do |set|
         set.draw do |map|
-          map.show_named_route 'url_helper_with_controller/show_named_route', :controller => 'url_helper_with_controller', :action => 'show_named_route'
+          map.show_named_route 'url_helper_with_controller/show_named_route', :controller => 'url_helper', :action => 'show_named_route'
         end
         yield
       end
     end
 end
 
-class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
-  class TasksController < ActionController::Base
-    def self.controller_path; 'tasks' end
-
-    def index
-      render_default
-    end
+class TasksController < ActionController::Base
+  def index
+    render_default
+  end
 
-    def show
-      render_default
-    end
+  def show
+    render_default
+  end
 
-    def rescue_action(e) raise e end
+  def rescue_action(e) raise e end
 
-    protected
-      def render_default
-        render :inline =>
-          "<%= link_to_unless_current(\"tasks\", tasks_path) %>\n" +
-          "<%= link_to_unless_current(\"tasks\", tasks_url) %>"
-      end
-  end
+  protected
+    def render_default
+      render :inline =>
+        "<%= link_to_unless_current(\"tasks\", tasks_path) %>\n" +
+        "<%= link_to_unless_current(\"tasks\", tasks_url) %>"
+    end
+end
 
+class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
@@ -537,41 +536,37 @@ class Session
   end
 end
 
-class PolymorphicControllerTest < ActionView::TestCase
-  class WorkshopsController < ActionController::Base
-    def self.controller_path; 'workshops' end
-
-    def index
-      @workshop = Workshop.new(1, true)
-      render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
-    end
-
-    def show
-      @workshop = Workshop.new(params[:id], false)
-      render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
-    end
-
-    def rescue_action(e) raise e end
+class WorkshopsController < ActionController::Base
+  def index
+    @workshop = Workshop.new(1, true)
+    render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
   end
 
-  class SessionsController < ActionController::Base
-    def self.controller_path; 'sessions' end
+  def show
+    @workshop = Workshop.new(params[:id], false)
+    render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
+  end
 
-    def index
-      @workshop = Workshop.new(params[:workshop_id], false)
-      @session = Session.new(1, true)
-      render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
-    end
+  def rescue_action(e) raise e end
+end
 
-    def show
-      @workshop = Workshop.new(params[:workshop_id], false)
-      @session = Session.new(params[:id], false)
-      render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
-    end
+class SessionsController < ActionController::Base
+  def index
+    @workshop = Workshop.new(params[:workshop_id], false)
+    @session = Session.new(1, true)
+    render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
+  end
 
-    def rescue_action(e) raise e end
+  def show
+    @workshop = Workshop.new(params[:workshop_id], false)
+    @session = Session.new(params[:id], false)
+    render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
   end
 
+  def rescue_action(e) raise e end
+end
+
+class PolymorphicControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup