14 files changed, 76 insertions, 41 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index cbb8968496..d191a203dd 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -73,7 +73,17 @@ module RackTestUtils
 end
 
 module RenderERBUtils
+  def view
+    @view ||= begin
+      path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
+      view_paths = ActionView::PathSet.new([path])
+      ActionView::Base.new(view_paths)
+    end
+  end
+
   def render_erb(string)
+    @virtual_path = nil
+
     template = ActionView::Template.new(
       string.strip,
       "test template",
@@ -341,3 +351,8 @@ module ActionDispatch
   end
 end
 
+module RoutingTestHelpers
+  def url_for(set, options, recall = nil)
+    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
+  end
+end
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index fc829aa6b4..90e7f4ae59 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -2,36 +2,36 @@ require 'active_record_unit'
 require 'fixtures/project'
 
 class Task < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Step < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Bid < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Tax < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Fax < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Series < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 module Blog
   class Post < ActiveRecord::Base
-    set_table_name 'projects'
+    self.table_name = 'projects'
   end
 
   class Blog < ActiveRecord::Base
-    set_table_name 'projects'
+    self.table_name = 'projects'
   end
 
   def self.use_relative_model_naming?
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index ccdfcb0b2c..700fd788fa 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -13,6 +13,11 @@ module Another
       head :status => 406
     end
 
+    before_filter :redirector, :only => :never_executed
+
+    def never_executed
+    end
+
     def show
       render :nothing => true
     end
@@ -49,7 +54,6 @@ module Another
     def with_rescued_exception
       raise SpecialException
     end
-
   end
 end
 
@@ -86,6 +90,13 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_equal "Processing by Another::LogSubscribersController#show as HTML", logs.first
   end
 
+  def test_halted_callback
+    get :never_executed
+    wait
+    assert_equal 4, logs.size
+    assert_equal "Filter chain halted as :redirector rendered or redirected", logs.third
+  end
+
   def test_process_action
     get :show
     wait
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 5bf68decca..4a67380f59 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -11,12 +11,6 @@ end
 
 ROUTING = ActionDispatch::Routing
 
-module RoutingTestHelpers
-  def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
-  end
-end
-
 # See RFC 3986, section 3.3 for allowed path characters.
 class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   include RoutingTestHelpers
diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb
index 7b734ff0fb..451ea6027d 100644
--- a/actionpack/test/controller/url_for_integration_test.rb
+++ b/actionpack/test/controller/url_for_integration_test.rb
@@ -3,12 +3,6 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/core_ext/object/with_options'
 
-module RoutingTestHelpers
-  def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
-  end
-end
-
 module ActionPack
   class URLForIntegrationTest < ActiveSupport::TestCase
     include RoutingTestHelpers
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 5875725b5d..90f13a3bb9 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -135,4 +135,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
     assert_match(/puke/, output.rewind && output.read)
   end
+
+  test 'uses backtrace cleaner from env' do
+    @app = DevelopmentApp
+    cleaner = stub(:clean => ['passed backtrace cleaner'])
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
+    assert_match(/passed backtrace cleaner/, body)
+  end
 end
diff --git a/actionpack/test/fixtures/company.rb b/actionpack/test/fixtures/company.rb
index cd39ea7898..e29978801e 100644
--- a/actionpack/test/fixtures/company.rb
+++ b/actionpack/test/fixtures/company.rb
@@ -1,10 +1,10 @@
 class Company < ActiveRecord::Base
   has_one :mascot
   attr_protected :rating
-  set_sequence_name :companies_nonstd_seq
+  self.sequence_name = :companies_nonstd_seq
 
   validates_presence_of :name
   def validate
     errors.add('rating', 'rating should not be 2') if rating == 2
   end
-end
-\ No newline at end of file
+end
diff --git a/actionpack/test/fixtures/developer.rb b/actionpack/test/fixtures/developer.rb
index c70eda34c6..dd14548fac 100644
--- a/actionpack/test/fixtures/developer.rb
+++ b/actionpack/test/fixtures/developer.rb
@@ -5,5 +5,5 @@ class Developer < ActiveRecord::Base
 end
 
 class DeVeLoPeR < ActiveRecord::Base
-  set_table_name "developers"
+  self.table_name = "developers"
 end
diff --git a/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb b/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
new file mode 100644
index 0000000000..2f21a75dd9
--- /dev/null
+++ b/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
@@ -0,0 +1,3 @@
+<%= content_tag 'p' do %>
+  <%= content_tag 'b', 'Hello' %>
+<% end %>
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index ad876df65d..3fee366804 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -3,6 +3,8 @@ require 'controller/fake_models'
 require 'active_support/core_ext/object/inclusion'
 
 class FormHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::FormHelper
 
   def form_for(*)
@@ -231,9 +233,6 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_label_with_block_in_erb
-    path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
-    view_paths = ActionView::PathSet.new([path])
-    view = ActionView::Base.new(view_paths)
     assert_equal "<label for=\"post_message\">\n  Message\n  <input id=\"post_message\" name=\"post[message]\" size=\"30\" type=\"text\" />\n</label>", view.render("test/label_with_block")
   end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 6eae9bf846..233907d07a 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -2,6 +2,8 @@ require 'abstract_unit'
 require 'active_support/core_ext/object/inclusion'
 
 class FormTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::FormTagHelper
 
   def setup
@@ -104,14 +106,14 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block_in_erb
-    output_buffer = form_tag("http://www.example.com") { concat "Hello world!" }
+    output_buffer = render_erb("<%= form_tag('http://www.example.com') do %>Hello world!<% end %>")
 
     expected = whole_form { "Hello world!" }
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method_in_erb
-    output_buffer = form_tag("http://www.example.com", :method => :put) { concat "Hello world!" }
+    output_buffer = render_erb("<%= form_tag('http://www.example.com', :method => :put) do %>Hello world!<% end %>")
 
     expected = whole_form("http://www.example.com", :method => "put") do
       "Hello world!"
@@ -485,27 +487,27 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_field_set_tag_in_erb
-    output_buffer = field_set_tag("Your details") { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('Your details') do %>Hello world!<% end %>")
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag do %>Hello world!<% end %>")
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag('') { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('') do %>Hello world!<% end %>")
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag('', :class => 'format') { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('', :class => 'format') do %>Hello world!<% end %>")
 
     expected = %(<fieldset class="format">Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
   end
-  
+
   def test_text_area_tag_options_symbolize_keys_side_effects
     options = { :option => "random_option" }
     text_area_tag "body", "hello world", options
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 7f23629e05..ec777d15c4 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -22,6 +22,8 @@ class Post
 end
 
 class RecordTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::RecordTagHelper
 
   def setup
@@ -58,13 +60,13 @@ class RecordTagHelperTest < ActionView::TestCase
 
   def test_block_works_with_content_tag_for_in_erb
     expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { concat @post.body }
+    actual = render_erb("<%= content_tag_for(:tr, @post) do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
   def test_div_for_in_erb
     expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { concat @post.body }
+    actual = render_erb("<%= div_for(@post, :class => 'bar') do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 26a504beb8..64fdd53e73 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -41,6 +41,10 @@ class SprocketsHelperTest < ActionView::TestCase
     @controller ? @controller.config : @config
   end
 
+  def compute_host(source, request, options = {})
+    raise "Should never get here"
+  end
+
   test "asset_path" do
     assert_match %r{/assets/logo-[0-9a-f]+.png},
       asset_path("logo.png")
@@ -125,6 +129,10 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_raises ActionController::RoutingError do
       asset_path("logo.png")
     end
+    @config.asset_host = method :compute_host
+    assert_raises ActionController::RoutingError do
+      asset_path("logo.png")
+    end
   end
 
   test "image_tag" do
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 60b466a9ff..6c325d5abb 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -1,6 +1,8 @@
 require 'abstract_unit'
 
 class TagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::TagHelper
 
   def test_tag
@@ -44,12 +46,12 @@ class TagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_with_block_in_erb
-    buffer = content_tag(:div) { concat "Hello world!" }
+    buffer = render_erb("<%= content_tag(:div) do %>Hello world!<% end %>")
     assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
   def test_content_tag_with_block_and_options_in_erb
-    buffer = content_tag(:div, :class => "green") { concat "Hello world!" }
+    buffer = render_erb("<%= content_tag(:div, :class => 'green') do %>Hello world!<% end %>")
     assert_dom_equal %(<div class="green">Hello world!</div>), buffer
   end
 
@@ -68,10 +70,8 @@ class TagHelperTest < ActionView::TestCase
                  output_buffer
   end
 
-  # TAG TODO: Move this into a real template
   def test_content_tag_nested_in_content_tag_in_erb
-    buffer = content_tag("p") { concat content_tag("b", "Hello") }
-    assert_equal '<p><b>Hello</b></p>', buffer
+    assert_equal "<p>\n  <b>Hello</b>\n</p>", view.render("test/content_tag_nested_in_content_tag")
   end
 
   def test_content_tag_with_escaped_array_class