7 files changed, 65 insertions, 84 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index 9eae3a4fbd..7c71fdabd1 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -274,7 +274,6 @@ ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
 
 module ActionController
   class Base
-    include ActionController::Testing
     # This stub emulates the Railtie including the URL helpers from a Rails application
     include SharedTestRoutes.url_helpers
     include SharedTestRoutes.mounted_helpers
diff --git a/actionview/test/actionpack/abstract/abstract_controller_test.rb b/actionview/test/actionpack/abstract/abstract_controller_test.rb
index 40d3b17131..e653b12d32 100644
--- a/actionview/test/actionpack/abstract/abstract_controller_test.rb
+++ b/actionview/test/actionpack/abstract/abstract_controller_test.rb
@@ -150,6 +150,54 @@ module AbstractController
       end
     end
 
+    class OverridingLocalPrefixes < AbstractController::Base
+      include AbstractController::Rendering
+      include ActionView::Rendering
+      append_view_path File.expand_path(File.join(File.dirname(__FILE__), "views"))
+
+      def index
+        render
+      end
+
+      def self.local_prefixes
+        # this would usually return "abstract_controller/testing/overriding_local_prefixes"
+        super + ["abstract_controller/testing/me3"]
+      end
+
+      class Inheriting < self
+      end
+    end
+
+    class OverridingLocalPrefixesTest < ActiveSupport::TestCase # TODO: remove me in 5.0/4.3.
+      test "overriding .local_prefixes adds prefix" do
+        @controller = OverridingLocalPrefixes.new
+        @controller.process(:index)
+        assert_equal "Hello from me3/index.erb", @controller.response_body
+      end
+
+      test ".local_prefixes is inherited" do
+        @controller = OverridingLocalPrefixes::Inheriting.new
+        @controller.process(:index)
+        assert_equal "Hello from me3/index.erb", @controller.response_body
+      end
+    end
+
+    class DeprecatedParentPrefixes < OverridingLocalPrefixes
+      def self.parent_prefixes
+        ["abstract_controller/testing/me3"]
+      end
+    end
+
+    class DeprecatedParentPrefixesTest < ActiveSupport::TestCase # TODO: remove me in 5.0/4.3.
+      test "overriding .parent_prefixes is deprecated" do
+        @controller = DeprecatedParentPrefixes.new
+        assert_deprecated do
+          @controller.process(:index)
+        end
+        assert_equal "Hello from me3/index.erb", @controller.response_body
+      end
+    end
+
     # Test rendering with layouts
     # ====
     # self._layout is used when defined
diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb
index 18e4277d7a..343681b5a9 100644
--- a/actionview/test/template/asset_tag_helper_test.rb
+++ b/actionview/test/template/asset_tag_helper_test.rb
@@ -596,6 +596,10 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_equal "gopher://www.example.com", compute_asset_host("foo", :protocol => :request)
   end
 
+  def test_should_return_custom_host_if_passed_in_options
+    assert_equal "http://custom.example.com", compute_asset_host("foo", :host => "http://custom.example.com")
+  end
+
   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
@@ -759,4 +763,15 @@ class AssetUrlHelperEmptyModuleTest < ActionView::TestCase
     assert @module.config.asset_host
     assert_equal "http://www.example.com/foo", @module.asset_url("foo")
   end
+
+  def test_asset_url_with_custom_asset_host
+    @module.instance_eval do
+      def config
+        Struct.new(:asset_host).new("http://www.example.com")
+      end
+    end
+
+    assert @module.config.asset_host
+    assert_equal "http://custom.example.com/foo", @module.asset_url("foo", :host => "http://custom.example.com")
+  end
 end
diff --git a/actionview/test/template/capture_helper_test.rb b/actionview/test/template/capture_helper_test.rb
index 938f1c3e54..f213da5934 100644
--- a/actionview/test/template/capture_helper_test.rb
+++ b/actionview/test/template/capture_helper_test.rb
@@ -207,29 +207,6 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal "", @av.with_output_buffer {}
   end
 
-  def test_flush_output_buffer_concats_output_buffer_to_response
-    view = view_with_controller
-    assert_equal [], view.response.body_parts
-
-    view.output_buffer << 'OMG'
-    view.flush_output_buffer
-    assert_equal ['OMG'], view.response.body_parts
-    assert_equal '', view.output_buffer
-
-    view.output_buffer << 'foobar'
-    view.flush_output_buffer
-    assert_equal ['OMG', 'foobar'], view.response.body_parts
-    assert_equal '', view.output_buffer
-  end
-
-  def test_flush_output_buffer_preserves_the_encoding_of_the_output_buffer
-    view = view_with_controller
-    alt_encoding = alt_encoding(view.output_buffer)
-    view.output_buffer.force_encoding(alt_encoding)
-    flush_output_buffer
-    assert_equal alt_encoding, view.output_buffer.encoding
-  end
-
   def alt_encoding(output_buffer)
     output_buffer.encoding == Encoding::US_ASCII ? Encoding::UTF_8 : Encoding::US_ASCII
   end
diff --git a/actionview/test/template/number_helper_test.rb b/actionview/test/template/number_helper_test.rb
index adb888319d..0495224d04 100644
--- a/actionview/test/template/number_helper_test.rb
+++ b/actionview/test/template/number_helper_test.rb
@@ -48,6 +48,7 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal "-111.235", number_with_precision(-111.2346)
     assert_equal "111.00", number_with_precision(111, precision: 2)
     assert_equal "0.00100", number_with_precision(0.001, precision: 5)
+    assert_equal "3.33", number_with_precision(Rational(10, 3), precision: 2)
   end
 
   def test_number_to_human_size
diff --git a/actionview/test/template/output_buffer_test.rb b/actionview/test/template/output_buffer_test.rb
deleted file mode 100644
index eb0df3d1ab..0000000000
--- a/actionview/test/template/output_buffer_test.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'abstract_unit'
-
-class OutputBufferTest < ActionController::TestCase
-  class TestController < ActionController::Base
-    def index
-      render :text => 'foo'
-    end
-  end
-
-  tests TestController
-
-  def setup
-    @vc = @controller.view_context
-    get :index
-    assert_equal ['foo'], body_parts
-  end
-
-  test 'output buffer is nil after rendering' do
-    assert_nil output_buffer
-  end
-
-  test 'flushing ignores nil output buffer' do
-    @controller.view_context.flush_output_buffer
-    assert_nil output_buffer
-    assert_equal ['foo'], body_parts
-  end
-
-  test 'flushing ignores empty output buffer' do
-    @vc.output_buffer = ''
-    @vc.flush_output_buffer
-    assert_equal '', output_buffer
-    assert_equal ['foo'], body_parts
-  end
-
-  test 'flushing appends the output buffer to the body parts' do
-    @vc.output_buffer = 'bar'
-    @vc.flush_output_buffer
-    assert_equal '', output_buffer
-    assert_equal ['foo', 'bar'], body_parts
-  end
-
-  test 'flushing preserves output buffer encoding' do
-    original_buffer = ' '.force_encoding(Encoding::EUC_JP)
-    @vc.output_buffer = original_buffer
-    @vc.flush_output_buffer
-    assert_equal ['foo', original_buffer], body_parts
-    assert_not_equal original_buffer, output_buffer
-    assert_equal Encoding::EUC_JP, output_buffer.encoding
-  end
-
-  protected
-    def output_buffer
-      @vc.output_buffer
-    end
-
-    def body_parts
-      @controller.response.body_parts
-    end
-end
diff --git a/actionview/test/template/sanitize_helper_test.rb b/actionview/test/template/sanitize_helper_test.rb
index 12d5260a9d..f7c8f36b78 100644
--- a/actionview/test/template/sanitize_helper_test.rb
+++ b/actionview/test/template/sanitize_helper_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-# The exhaustive tests are in test/controller/html/sanitizer_test.rb.
+# The exhaustive tests are in  test/template/html-scanner/sanitizer_test.rb
 # This tests the that the helpers hook up correctly to the sanitizer classes.
 class SanitizeHelperTest < ActionView::TestCase
   tests ActionView::Helpers::SanitizeHelper