14 files changed, 88 insertions, 328 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b94f45bfe7..5d727b3811 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -259,7 +259,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_flash_exist
     process :flash_me
     assert flash.any?
-    assert_present flash['hello']
+    assert flash['hello'].present?
   end
 
   def test_flash_does_not_exist
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 2428cd7433..ca86837a2c 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -296,6 +296,24 @@ class CacheHelperOutputBufferTest < ActionController::TestCase
   end
 end
 
+class ViewCacheDependencyTest < ActionController::TestCase
+  class NoDependenciesController < ActionController::Base
+  end
+
+  class HasDependenciesController < ActionController::Base
+    view_cache_dependency { "trombone" }
+    view_cache_dependency { "flute" }
+  end
+
+  def test_view_cache_dependencies_are_empty_by_default
+    assert NoDependenciesController.new.view_cache_dependencies.empty?
+  end
+
+  def test_view_cache_dependencies_are_listed_in_declaration_order
+    assert_equal %w(trombone flute), HasDependenciesController.new.view_cache_dependencies
+  end
+end
+
 class DeprecatedPageCacheExtensionTest < ActiveSupport::TestCase
   def test_page_cache_extension_binds_default_static_extension
     deprecation_behavior = ActiveSupport::Deprecation.behavior
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 1c59dd5953..3b79161ad3 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -450,11 +450,9 @@ class FilterTest < ActionController::TestCase
 
   class RescuingAroundFilterWithBlock
     def around(controller)
-      begin
-        yield
-      rescue ErrorToRescue => ex
-        controller.__send__ :render, :text => "I rescued this: #{ex.inspect}"
-      end
+      yield
+    rescue ErrorToRescue => ex
+      controller.__send__ :render, :text => "I rescued this: #{ex.inspect}"
     end
   end
 
diff --git a/actionpack/test/controller/http_token_authentication_test.rb b/actionpack/test/controller/http_token_authentication_test.rb
index faf923e929..ebf6d224aa 100644
--- a/actionpack/test/controller/http_token_authentication_test.rb
+++ b/actionpack/test/controller/http_token_authentication_test.rb
@@ -111,21 +111,21 @@ class HttpTokenAuthenticationTest < ActionController::TestCase
     assert_equal(expected, actual)
   end
 
-  test "token_and_options returns correct token" do
+  test "token_and_options returns correct token with value after the equal sign" do
     token = 'rcHu+=HzSFw89Ypyhn/896A==f34'
     actual = ActionController::HttpAuthentication::Token.token_and_options(sample_request(token)).first
     expected = token
     assert_equal(expected, actual)
   end
 
-  test "token_and_options returns correct token" do
+  test "token_and_options returns correct token with slashes" do
     token = 'rcHu+\\\\"/896A'
     actual = ActionController::HttpAuthentication::Token.token_and_options(sample_request(token)).first
     expected = token
     assert_equal(expected, actual)
   end
 
-  test "token_and_options returns correct token" do
+  test "token_and_options returns correct token with quotes" do
     token = '\"quote\" pretty'
     actual = ActionController::HttpAuthentication::Token.token_and_options(sample_request(token)).first
     expected = token
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 20e433d1ec..3b1a07d7af 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -40,7 +40,7 @@ module ActionController
 
       def thread_locals
         tc.assert_equal 'aaron', Thread.current[:setting]
-        tc.refute_equal Thread.current.object_id, Thread.current[:originating_thread]
+        tc.assert_not_equal Thread.current.object_id, Thread.current[:originating_thread]
 
         response.headers['Content-Type'] = 'text/event-stream'
         %w{ hello world }.each do |word|
diff --git a/actionpack/test/controller/output_escaping_test.rb b/actionpack/test/controller/output_escaping_test.rb
index f6913a2138..43a8c05cda 100644
--- a/actionpack/test/controller/output_escaping_test.rb
+++ b/actionpack/test/controller/output_escaping_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 class OutputEscapingTest < ActiveSupport::TestCase
 
   test "escape_html shouldn't die when passed nil" do
-    assert_blank ERB::Util.h(nil)
+    assert ERB::Util.h(nil).blank?
   end
 
   test "escapeHTML should escape strings" do
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 7640bc12a2..0e5bad7482 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -531,6 +531,10 @@ class TestController < ActionController::Base
     head :created, :content_type => "application/json"
   end
 
+  def head_ok_with_image_png_content_type
+    head :ok, :content_type => "image/png"
+  end
+
   def head_with_location_header
     head :location => "/foo"
   end
@@ -789,15 +793,13 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_line_offset
-    begin
-      get :render_line_offset
-      flunk "the action should have raised an exception"
-    rescue StandardError => exc
-      line = exc.backtrace.first
-      assert(line =~ %r{:(\d+):})
-      assert_equal "1", $1,
-        "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
-    end
+    get :render_line_offset
+    flunk "the action should have raised an exception"
+  rescue StandardError => exc
+    line = exc.backtrace.first
+    assert(line =~ %r{:(\d+):})
+    assert_equal "1", $1,
+      "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
   end
 
   # :ported: compatibility
@@ -1217,20 +1219,27 @@ class RenderTest < ActionController::TestCase
 
   def test_head_created
     post :head_created
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_response :created
   end
 
   def test_head_created_with_application_json_content_type
     post :head_created_with_application_json_content_type
-    assert_blank @response.body
-    assert_equal "application/json", @response.content_type
+    assert @response.body.blank?
+    assert_equal "application/json", @response.header["Content-Type"]
     assert_response :created
   end
 
+  def test_head_ok_with_image_png_content_type
+    post :head_ok_with_image_png_content_type
+    assert @response.body.blank?
+    assert_equal "image/png", @response.header["Content-Type"]
+    assert_response :ok
+  end
+
   def test_head_with_location_header
     get :head_with_location_header
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal "/foo", @response.headers["Location"]
     assert_response :ok
   end
@@ -1243,7 +1252,7 @@ class RenderTest < ActionController::TestCase
       end
 
       get :head_with_location_object
-      assert_blank @response.body
+      assert @response.body.blank?
       assert_equal "http://www.nextangle.com/customers/1", @response.headers["Location"]
       assert_response :ok
     end
@@ -1251,14 +1260,14 @@ class RenderTest < ActionController::TestCase
 
   def test_head_with_custom_header
     get :head_with_custom_header
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal "something", @response.headers["X-Custom-Header"]
     assert_response :ok
   end
 
   def test_head_with_www_authenticate_header
     get :head_with_www_authenticate_header
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal "something", @response.headers["WWW-Authenticate"]
     assert_response :ok
   end
@@ -1433,10 +1442,11 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_locals_option_to_assert_template_is_not_supported
+    get :partial_collection_with_locals
+
     warning_buffer = StringIO.new
     $stderr = warning_buffer
 
-    get :partial_collection_with_locals
     assert_template partial: 'customer_greeting', locals: { greeting: 'Bonjour' }
     assert_equal "the :locals option to #assert_template is only supported in a ActionView::TestCase\n", warning_buffer.string
   ensure
@@ -1591,7 +1601,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = @last_modified
     get :conditional_hello
     assert_equal 304, @response.status.to_i
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
@@ -1606,7 +1616,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
     get :conditional_hello
     assert_equal 200, @response.status.to_i
-    assert_present @response.body
+    assert @response.body.present?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
@@ -1620,7 +1630,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = @last_modified
     get :conditional_hello_with_record
     assert_equal 304, @response.status.to_i
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
@@ -1635,7 +1645,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
     get :conditional_hello_with_record
     assert_equal 200, @response.status.to_i
-    assert_present @response.body
+    assert @response.body.present?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 1f637eb791..523a8d0572 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -320,7 +320,7 @@ class FreeCookieControllerTest < ActionController::TestCase
 
   test 'should not emit a csrf-token meta tag' do
     get :meta
-    assert_blank @response.body
+    assert @response.body.blank?
   end
 end
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index f0430e516f..5e821046db 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -57,13 +57,13 @@ class UriReservedCharactersRoutingTest < ActiveSupport::TestCase
 end
 
 class MockController
-  def self.build(helpers)
+  def self.build(helpers, additional_options = {})
     Class.new do
-      def url_options
-        options = super
+      define_method :url_options do
+        options = super()
         options[:protocol] ||= "http"
         options[:host] ||= "test.host"
-        options
+        options.merge(additional_options)
       end
 
       include helpers
@@ -428,8 +428,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     routes.send(:pages_url)
   end
 
-  def setup_for_named_route
-    MockController.build(rs.url_helpers).new
+  def setup_for_named_route(options = {})
+    MockController.build(rs.url_helpers, options).new
   end
 
   def test_named_route_without_hash
@@ -456,6 +456,16 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal("/", routes.send(:root_path))
   end
 
+  def test_named_route_root_with_trailing_slash
+    rs.draw do
+      root "hello#index"
+    end
+
+    routes = setup_for_named_route(trailing_slash: true)
+    assert_equal("http://test.host/", routes.send(:root_url))
+    assert_equal("http://test.host/?foo=bar", routes.send(:root_url, foo: :bar))
+  end
+
   def test_named_route_with_regexps
     rs.draw do
       get 'page/:year/:month/:day/:title' => 'page#show', :as => 'article',
diff --git a/actionpack/test/controller/spec_style_test.rb b/actionpack/test/controller/spec_style_test.rb
deleted file mode 100644
index e118c584ca..0000000000
--- a/actionpack/test/controller/spec_style_test.rb
+++ /dev/null
@@ -1,208 +0,0 @@
-require "abstract_unit"
-
-class ApplicationController < ActionController::Base; end
-class ModelsController      < ApplicationController;  end
-module Admin
-  class WidgetsController < ApplicationController; end
-end
-
-# ApplicationController
-describe ApplicationController do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ApplicationController, @controller
-      end
-    end
-  end
-end
-
-describe ApplicationController, :index do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ApplicationController, @controller
-      end
-    end
-  end
-end
-
-describe ApplicationController, "unauthenticated user" do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ApplicationController, @controller
-      end
-    end
-  end
-end
-
-describe "ApplicationControllerTest" do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ApplicationController, @controller
-      end
-    end
-  end
-end
-
-describe "ApplicationControllerTest", :index do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ApplicationController, @controller
-      end
-    end
-  end
-end
-
-describe "ApplicationControllerTest", "unauthenticated user" do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ApplicationController, @controller
-      end
-    end
-  end
-end
-
-# ModelsController
-describe ModelsController do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ModelsController, @controller
-      end
-    end
-  end
-end
-
-describe ModelsController, :index do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ModelsController, @controller
-      end
-    end
-  end
-end
-
-describe ModelsController, "unauthenticated user" do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ModelsController, @controller
-      end
-    end
-  end
-end
-
-describe "ModelsControllerTest" do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ModelsController, @controller
-      end
-    end
-  end
-end
-
-describe "ModelsControllerTest", :index do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ModelsController, @controller
-      end
-    end
-  end
-end
-
-describe "ModelsControllerTest", "unauthenticated user" do
-  describe "nested" do
-    describe "even deeper" do
-      it "exists" do
-        assert_kind_of ModelsController, @controller
-      end
-    end
-  end
-end
-
-# Nested Admin::WidgetsControllerTest
-module Admin
-  class WidgetsControllerTest < ActionController::TestCase
-    test "exists" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-
-  describe WidgetsController do
-    describe "index" do
-      it "respond successful" do
-        assert_kind_of Admin::WidgetsController, @controller
-      end
-    end
-  end
-
-  describe WidgetsController, "unauthenticated users" do
-    describe "index" do
-      it "respond successful" do
-        assert_kind_of Admin::WidgetsController, @controller
-      end
-    end
-  end
-end
-
-class Admin::WidgetsControllerTest < ActionController::TestCase
-  test "exists here too" do
-    assert_kind_of Admin::WidgetsController, @controller
-  end
-end
-
-describe Admin::WidgetsController do
-  describe "index" do
-    it "respond successful" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-end
-
-describe Admin::WidgetsController, "unauthenticated users" do
-  describe "index" do
-    it "respond successful" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-end
-
-describe "Admin::WidgetsController" do
-  describe "index" do
-    it "respond successful" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-end
-
-describe "Admin::WidgetsControllerTest" do
-  describe "index" do
-    it "respond successful" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-end
-
-describe "Admin::WidgetsController", "unauthenticated users" do
-  describe "index" do
-    it "respond successful" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-end
-
-describe "Admin::WidgetsControllerTest", "unauthenticated users" do
-  describe "index" do
-    it "respond successful" do
-      assert_kind_of Admin::WidgetsController, @controller
-    end
-  end
-end
diff --git a/actionpack/test/controller/spec_type_test.rb b/actionpack/test/controller/spec_type_test.rb
deleted file mode 100644
index 13be8a3405..0000000000
--- a/actionpack/test/controller/spec_type_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require "abstract_unit"
-
-class ApplicationController < ActionController::Base; end
-class ModelsController      < ApplicationController;  end
-
-class ActionControllerSpecTypeTest < ActiveSupport::TestCase
-  def assert_controller actual
-    assert_equal ActionController::TestCase, actual
-  end
-
-  def refute_controller actual
-    refute_equal ActionController::TestCase, actual
-  end
-
-  def test_spec_type_resolves_for_class_constants
-    assert_controller MiniTest::Spec.spec_type(ApplicationController)
-    assert_controller MiniTest::Spec.spec_type(ModelsController)
-  end
-
-  def test_spec_type_resolves_for_matching_strings
-    assert_controller MiniTest::Spec.spec_type("WidgetController")
-    assert_controller MiniTest::Spec.spec_type("WidgetControllerTest")
-    assert_controller MiniTest::Spec.spec_type("Widget Controller Test")
-    # And is not case sensitive
-    assert_controller MiniTest::Spec.spec_type("widgetcontroller")
-    assert_controller MiniTest::Spec.spec_type("widgetcontrollertest")
-    assert_controller MiniTest::Spec.spec_type("widget controller test")
-  end
-
-  def test_spec_type_wont_match_non_space_characters
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\tTest")
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\rTest")
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\nTest")
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\fTest")
-    refute_controller MiniTest::Spec.spec_type("Widget ControllerXTest")
-  end
-end
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index bdca1d4d77..e4d78d58b9 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -692,7 +692,7 @@ XML
     assert_equal "bar", @request.params[:foo]
     @request.recycle!
     post :no_op
-    assert_blank @request.params[:foo]
+    assert @request.params[:foo].blank?
   end
 
   def test_symbolized_path_params_reset_after_request
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index d3fc7128e9..ba24e7fac5 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -2,7 +2,6 @@ require 'abstract_unit'
 
 module AbstractController
   module Testing
-
     class UrlForTest < ActionController::TestCase
       class W
         include ActionDispatch::Routing::RouteSet.new.tap { |r| r.draw { get ':controller(/:action(/:id(.:format)))' } }.url_helpers
@@ -350,10 +349,10 @@ module AbstractController
       def test_with_hash_with_indifferent_access
         W.default_url_options[:controller] = 'd'
         W.default_url_options[:only_path]  = false
-        assert_equal("/c", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'only_path' => true)))
+        assert_equal("/c", W.new.url_for(ActiveSupport::HashWithIndifferentAccess.new('controller' => 'c', 'only_path' => true)))
 
         W.default_url_options[:action] = 'b'
-        assert_equal("/c/a", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true)))
+        assert_equal("/c/a", W.new.url_for(ActiveSupport::HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true)))
       end
 
       def test_url_params_with_nil_to_param_are_not_in_url
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index c0b9833603..0480295056 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -116,22 +116,22 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_register_and_use_yaml
+  def test_post_xml_using_a_disallowed_type_attribute
+    $stderr = StringIO.new
     with_test_route_set do
-      with_params_parsers Mime::YAML => Proc.new { |d| YAML.load(d) } do
-        post "/", {"entry" => "loaded from yaml"}.to_yaml,
-          {'CONTENT_TYPE' => 'application/x-yaml'}
+      post '/', '<foo type="symbol">value</foo>', 'CONTENT_TYPE' => 'application/xml'
+      assert_response 500
 
-        assert_equal 'entry', @controller.response.body
-        assert @controller.params.has_key?(:entry)
-        assert_equal 'loaded from yaml', @controller.params["entry"]
-      end
+      post '/', '<foo type="yaml">value</foo>', 'CONTENT_TYPE' => 'application/xml'
+      assert_response 500
     end
+  ensure
+    $stderr = STDERR
   end
 
-  def test_register_and_use_yaml_as_symbol
+  def test_register_and_use_yaml
     with_test_route_set do
-      with_params_parsers Mime::YAML => :yaml do
+      with_params_parsers Mime::YAML => Proc.new { |d| YAML.load(d) } do
         post "/", {"entry" => "loaded from yaml"}.to_yaml,
           {'CONTENT_TYPE' => 'application/x-yaml'}
 
@@ -211,36 +211,6 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_typecast_as_yaml
-    with_test_route_set do
-      with_params_parsers Mime::YAML => :yaml do
-        yaml = (<<-YAML).strip
-          ---
-          data:
-            a: 15
-            b: false
-            c: true
-            d: 2005-03-17
-            e: 2005-03-17T21:41:07Z
-            f: unparsed
-            g:
-              - 1
-              - hello
-              - 1974-07-25
-        YAML
-        post "/", yaml, {'CONTENT_TYPE' => 'application/x-yaml'}
-        params = @controller.params
-        assert_equal 15, params[:data][:a]
-        assert_equal false, params[:data][:b]
-        assert_equal true, params[:data][:c]
-        assert_equal Date.new(2005,3,17), params[:data][:d]
-        assert_equal Time.utc(2005,3,17,21,41,7), params[:data][:e]
-        assert_equal "unparsed", params[:data][:f]
-        assert_equal [1, "hello", Date.new(1974,7,25)], params[:data][:g]
-      end
-    end
-  end
-
   private
     def with_params_parsers(parsers = {})
       old_session = @integration_session