Merge remote-tracking branch 'origin/master'

77 files changed, 536 insertions, 1264 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 78ac05389c..6c9f3e0e67 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,12 +1,18 @@
 ## Rails 4.0.0 (unreleased) ##
 
-* Adds support for layouts when rendering a partial with a given collection. *serabe*
+*   Add `include_hidden` option to select tag. With `:include_hidden => false` select with `multiple` attribute doesn't generate hidden input with blank value. *Vasiliy Ermolovich*
 
-* Allows the route helper `root` to take a string argument. For example, `root 'pages#main'`. *bcardarella*
+*   Removed default `size` option from the `text_field`, `search_field`, `telephone_field`, `url_field`, `email_field` helpers. *Philip Arndt*
 
-* Forms of persisted records use always PATCH (via the `_method` hack). *fxn*
+*   Removed default `cols` and `rows` options from the `text_area` helper. *Philip Arndt*
 
-* For resources, both PATCH and PUT are routed to the `update` action. *fxn*
+*   Adds support for layouts when rendering a partial with a given collection. *serabe*
+
+*   Allows the route helper `root` to take a string argument. For example, `root 'pages#main'`. *bcardarella*
+
+*   Forms of persisted records use always PATCH (via the `_method` hack). *fxn*
+
+*   For resources, both PATCH and PUT are routed to the `update` action. *fxn*
 
 *   Don't ignore `force_ssl` in development. This is a change of behavior - use a `:if` condition to recreate the old behavior.
 
@@ -83,6 +89,9 @@
 *   check_box with `:form` html5 attribute will now replicate the `:form`
     attribute to the hidden field as well. *Carlos Antonio da Silva*
 
+*   Turn off verbose mode of rack-cache, we still have X-Rack-Cache to
+    check that info. Closes #5245. *Santiago Pastorino*
+
 *   `label` form helper accepts :for => nil to not generate the attribute. *Carlos Antonio da Silva*
 
 *   Add `:format` option to number_to_percentage *Rodrigo Flores*
@@ -115,6 +124,23 @@
      HTML5 `mark` element. *Brian Cardarella*
 
 
+## Rails 3.2.3 (unreleased) ##
+
+*   Do not include the authenticity token in forms where remote: true as ajax forms use the meta-tag value *DHH*
+
+*   Upgrade rack-cache to 1.2. *José Valim*
+
+*   ActionController::SessionManagement is removed. *Santiago Pastorino*
+
+*   Since the router holds references to many parts of the system like engines, controllers and the application itself, inspecting the route set can actually be really slow, therefore we default alias inspect to to_s. *José Valim*
+
+*   Add a new line after the textarea opening tag. Closes #393 *Rafael Mendonça França*
+
+*   Always pass a respond block from to responder. We should let the responder decide what to do with the given overridden response block, and not short circuit it. *Prem Sichanugrist*
+
+*   Fixes layout rendering regression from 3.2.2. *José Valim*
+
+
 ## Rails 3.2.2 (March 1, 2012) ##
 
 *   Format lookup for partials is derived from the format in which the template is being rendered. Closes #5025 part 2 *Santiago Pastorino*
@@ -305,6 +331,7 @@
     returned by the class method attribute_names will be wrapped. This fixes
     the wrapping of nested attributes by adding them to attr_accessible.
 
+
 ## Rails 3.1.4 (March 1, 2012) ##
 
 *   Skip assets group in Gemfile and all assets configurations options
@@ -321,6 +348,7 @@
 
 *   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
 
+
 ## Rails 3.1.3 (November 20, 2011) ##
 
 *   Downgrade sprockets to ~> 2.0.3. Using 2.1.0 caused regressions.
@@ -330,6 +358,7 @@
 
     *Jon Leighton*
 
+
 ## Rails 3.1.2 (November 18, 2011) ##
 
 *   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
@@ -371,6 +400,7 @@
 
 *   Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
 
+
 ## Rails 3.1.1 (October 07, 2011) ##
 
 *   javascript_path and stylesheet_path now refer to /assets if asset pipelining
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 089913be3c..589a67dc02 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',          '~> 1.4.1')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.1')
-  s.add_dependency('sprockets',     '~> 2.2.0')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 43cea3b79e..b068846a13 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -1,4 +1,5 @@
 require 'erubis'
+require 'set'
 require 'active_support/configurable'
 require 'active_support/descendants_tracker'
 require 'active_support/core_ext/module/anonymous'
@@ -59,7 +60,7 @@ module AbstractController
       # itself. Finally, #hidden_actions are removed.
       #
       # ==== Returns
-      # * <tt>array</tt> - A list of all methods that should be considered actions.
+      # * <tt>set</tt> - A set of all methods that should be considered actions.
       def action_methods
         @action_methods ||= begin
           # All public instance methods of this class, including ancestors
@@ -72,7 +73,7 @@ module AbstractController
             hidden_actions.to_a
 
           # Clear out AS callback method pollution
-          methods.reject { |method| method =~ /_one_time_conditions/ }
+          Set.new(methods.reject { |method| method =~ /_one_time_conditions/ })
         end
       end
 
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index a82e3dc90a..6f13ebe0d0 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -89,7 +89,7 @@ module AbstractController
   #   class TillController < BankController
   #     layout false
   #
-  # In these examples, we have three implicit lookup scenrios:
+  # In these examples, we have three implicit lookup scenarios:
   # * The BankController uses the "bank" layout.
   # * The ExchangeController uses the "exchange" layout.
   # * The CurrencyController inherits the layout from BankController.
@@ -120,6 +120,7 @@ module AbstractController
   #       def writers_and_readers
   #         logged_in? ? "writer_layout" : "reader_layout"
   #       end
+  #   end
   #
   # Now when a new request for the index action is processed, the layout will vary depending on whether the person accessing
   # is logged in or not.
@@ -127,7 +128,14 @@ module AbstractController
   # If you want to use an inline method, such as a proc, do something like this:
   #
   #   class WeblogController < ActionController::Base
-  #     layout proc{ |controller| controller.logged_in? ? "writer_layout" : "reader_layout" }
+  #     layout proc { |controller| controller.logged_in? ? "writer_layout" : "reader_layout" }
+  #   end
+  #
+  # If an argument isn't given to the proc, it's evaluated in the context of
+  # the current controller anyway.
+  #
+  #   class WeblogController < ActionController::Base
+  #     layout proc { logged_in? ? "writer_layout" : "reader_layout" }
   #   end
   #
   # Of course, the most common way of specifying a layout is still just as a plain template name:
@@ -298,12 +306,12 @@ module AbstractController
               end
             RUBY
           when Proc
-            define_method :_layout_from_proc, &_layout
-            "_layout_from_proc(self)"
+              define_method :_layout_from_proc, &_layout
+              _layout.arity == 0 ? "_layout_from_proc" : "_layout_from_proc(self)"
           when false
             nil
           when true
-            raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
+            raise ArgumentError, "Layouts must be specified as a String, Symbol, Proc, false, or nil"
           when nil
             name_clause
         end
@@ -363,7 +371,7 @@ module AbstractController
       when false, nil then nil
       else
         raise ArgumentError,
-          "String, true, or false, expected for `layout'; you passed #{name.inspect}"
+          "String, Proc, :default, true, or false, expected for `layout'; you passed #{name.inspect}"
       end
     end
 
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index ddc93464cd..7d73c6af8d 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -105,6 +105,7 @@ module AbstractController
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
+      lookup_context.rendered_format = nil if options[:formats]
       view_renderer.render(view_context, options)
     end
 
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 95de595f4f..71425cd542 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -171,11 +171,11 @@ module ActionController
   class Base < Metal
     abstract!
 
-    # Shortcut helper that returns all the ActionController modules except the ones passed in the argument:
+    # Shortcut helper that returns all the ActionController::Base modules except the ones passed in the argument:
     #
     #   class MetalController
-    #     ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |module|
-    #       include module
+    #     ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |left|
+    #       include left
     #     end
     #   end
     #
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 49cf70ec21..bb176ca3f9 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -54,6 +54,11 @@ module ActionController #:nodoc:
       class Sweeper < ActiveRecord::Observer #:nodoc:
         attr_accessor :controller
 
+        def initialize(*args)
+          super
+          @controller = nil
+        end
+
         def before(controller)
           self.controller = controller
           callback(:before) if controller.perform_caching
@@ -88,7 +93,7 @@ module ActionController #:nodoc:
           end
 
           def method_missing(method, *arguments, &block)
-            return unless @controller
+            super unless @controller
             @controller.__send__(method, *arguments, &block)
           end
       end
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index a1e40fc4e0..ac12cbb625 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -44,7 +44,7 @@ module ActionController
             redirect_options = {:protocol => 'https://', :status => :moved_permanently}
             redirect_options.merge!(:host => host) if host
             redirect_options.merge!(:params => request.query_parameters)
-            flash.keep
+            flash.keep if respond_to?(:flash)
             redirect_to redirect_options
           end
         end
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index d070eaae5d..1a4bca12d2 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -52,6 +52,7 @@ module ActionController
   module Helpers
     extend ActiveSupport::Concern
 
+    class << self; attr_accessor :helpers_path; end
     include AbstractController::Helpers
 
     included do
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 1e3c2d83cf..7ff5d48c5a 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -355,8 +355,12 @@ module ActionController #:nodoc:
       end
     end
 
-    # Collects mimes and return the response for the negotiated format. Returns
-    # nil if :not_acceptable was sent to the client.
+    # Returns a Collector object containing the appropriate mime-type response
+    # for the current request, based on the available responses defined by a block.
+    # In typical usage this is the block passed to +respond_with+ or +respond_to+.
+    #
+    # Sends :not_acceptable to the client and returns nil if no suitable format
+    # is available.
     #
     def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
       mimes ||= collect_mimes_from_class_level
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index b07742e0e1..3ffb7ef426 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -93,7 +93,7 @@ module ActionController
           _compute_redirect_to_location options.call
         else
           url_for(options)
-        end.gsub(/[\r\n]/, '')
+        end.gsub(/[\0\r\n]/, '')
       end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index afa9243f02..3081c14c09 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -37,6 +37,10 @@ module ActionController #:nodoc:
       config_accessor :request_forgery_protection_token
       self.request_forgery_protection_token ||= :authenticity_token
 
+      # Controls how unverified request will be handled
+      config_accessor :request_forgery_protection_method
+      self.request_forgery_protection_method ||= :reset_session
+
       # Controls whether request forgery protection is turned on or not. Turned off by default only in test mode.
       config_accessor :allow_forgery_protection
       self.allow_forgery_protection = true if allow_forgery_protection.nil?
@@ -64,8 +68,10 @@ module ActionController #:nodoc:
       # Valid Options:
       #
       # * <tt>:only/:except</tt> - Passed to the <tt>before_filter</tt> call. Set which actions are verified.
+      # * <tt>:with</tt> - Set the method to handle unverified request. Valid values: <tt>:exception</tt> and <tt>:reset_session</tt> (default).
       def protect_from_forgery(options = {})
         self.request_forgery_protection_token ||= :authenticity_token
+        self.request_forgery_protection_method = options.delete(:with) if options.key?(:with)
         prepend_before_filter :verify_authenticity_token, options
       end
     end
@@ -80,9 +86,19 @@ module ActionController #:nodoc:
       end
 
       # This is the method that defines the application behavior when a request is found to be unverified.
-      # By default, \Rails resets the session when it finds an unverified request.
+      # By default, \Rails uses <tt>request_forgery_protection_method</tt> when it finds an unverified request:
+      #
+      # * <tt>:reset_session</tt> - Resets the session.
+      # * <tt>:exception</tt>: - Raises ActionController::InvalidAuthenticityToken exception.
       def handle_unverified_request
-        reset_session
+        case request_forgery_protection_method
+        when :exception
+          raise ActionController::InvalidAuthenticityToken
+        when :reset_session
+          reset_session
+        else
+          raise ArgumentError, 'Invalid request forgery protection method, use :exception or :reset_session'
+        end
       end
 
       # Returns true or false if a request is verified. Checks:
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 3e170d7872..851a2c4aee 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -3,33 +3,32 @@ require "action_controller"
 require "action_dispatch/railtie"
 require "action_view/railtie"
 require "abstract_controller/railties/routes_helpers"
-require "action_controller/railties/paths"
+require "action_controller/railties/helpers"
 
 module ActionController
   class Railtie < Rails::Railtie #:nodoc:
     config.action_controller = ActiveSupport::OrderedOptions.new
 
-    initializer "action_controller.logger" do
-      ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
-    end
-
-    initializer "action_controller.initialize_framework_caches" do
-      ActiveSupport.on_load(:action_controller) { self.cache_store ||= Rails.cache }
-    end
-
     initializer "action_controller.assets_config", :group => :all do |app|
       app.config.action_controller.assets_dir ||= app.config.paths["public"].first
     end
 
+    initializer "action_controller.set_helpers_path" do |app|
+      ActionController::Helpers.helpers_path = app.helpers_paths
+    end
+
     initializer "action_controller.set_configs" do |app|
       paths   = app.config.paths
       options = app.config.action_controller
 
+      options.logger               ||= Rails.logger
+      options.cache_store          ||= Rails.cache
+
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first
       options.page_cache_directory ||= paths["public"].first
 
-      # make sure readers methods get compiled
+      # Ensure readers methods get compiled
       options.asset_path           ||= app.config.asset_path
       options.asset_host           ||= app.config.asset_host
       options.relative_url_root    ||= app.config.relative_url_root
@@ -37,8 +36,16 @@ module ActionController
       ActiveSupport.on_load(:action_controller) do
         include app.routes.mounted_helpers
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
-        extend ::ActionController::Railties::Paths.with(app)
-        options.each { |k,v| send("#{k}=", v) }
+        extend ::ActionController::Railties::Helpers
+
+        options.each do |k,v|
+          k = "#{k}="
+          if respond_to?(k)
+            send(k, v)
+          elsif !Base.respond_to?(k)
+            raise "Invalid option key: #{k}"
+          end
+        end
       end
     end
 
diff --git a/actionpack/lib/action_controller/railties/helpers.rb b/actionpack/lib/action_controller/railties/helpers.rb
new file mode 100644
index 0000000000..3985c6b273
--- /dev/null
+++ b/actionpack/lib/action_controller/railties/helpers.rb
@@ -0,0 +1,22 @@
+module ActionController
+  module Railties
+    module Helpers
+      def inherited(klass)
+        super
+        return unless klass.respond_to?(:helpers_path=)
+
+        if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
+          paths = namespace.railtie_helpers_paths
+        else
+          paths = ActionController::Helpers.helpers_path
+        end
+
+        klass.helpers_path = paths
+
+        if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
+          klass.helper :all
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
deleted file mode 100644
index bbe63149ad..0000000000
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module ActionController
-  module Railties
-    module Paths
-      def self.with(app)
-        Module.new do
-          define_method(:inherited) do |klass|
-            super(klass)
-
-            if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
-              paths = namespace.railtie_helpers_paths
-            else
-              paths = app.helpers_paths
-            end
-
-            klass.helpers_path = paths
-
-            if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
-              klass.helper :all
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 9c38ff44d8..18dda978b3 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -2,8 +2,8 @@ require 'active_support/core_ext/module'
 
 module ActionController
   # The record identifier encapsulates a number of naming conventions for dealing with records, like Active Records or
-  # Active Resources or pretty much any other model type that has an id. These patterns are then used to try elevate
-  # the view actions to a higher logical level. Example:
+  # pretty much any other model type that has an id. These patterns are then used to try elevate the view actions to
+  # a higher logical level. Example:
   #
   #   # routes
   #   resources :posts
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index e9a3ec5a22..7ba8319e4c 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -56,6 +56,9 @@ module ActionController
     #   # assert that the "new" view template was rendered
     #   assert_template "new"
     #
+    #   # assert that the exact template "admin/posts/new" was rendered
+    #   assert_template %r{\Aadmin/posts/new\Z}
+    #
     #   # assert that the "_customer" partial was rendered twice
     #   assert_template :partial => '_customer', :count => 2
     #
@@ -74,11 +77,11 @@ module ActionController
       response.body
 
       case options
-      when NilClass, String, Symbol
+      when NilClass, String, Symbol, Regexp
         options = options.to_s if Symbol === options
         rendered = @templates
         msg = message || sprintf("expecting <%s> but rendering with <%s>",
-                options, rendered.keys)
+                options.inspect, rendered.keys)
         assert_block(msg) do
           if options
             rendered.any? { |t,num| t.match(options) }
@@ -121,6 +124,8 @@ module ActionController
           assert @partials.empty?,
             "Expected no partials to be rendered"
         end
+      else
+        raise ArgumentError, "assert_template only accepts a String, Symbol, Hash, Regexp, or nil"
       end
     end
   end
@@ -500,11 +505,6 @@ module ActionController
         end
       end
 
-      # Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
-      def rescue_action_in_public!
-        @request.remote_addr = '208.77.188.166' # example.com
-      end
-
       included do
         include ActionController::TemplateAssertions
         include ActionDispatch::Assertions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 84732085f0..078229efd2 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -51,12 +51,13 @@ module ActionDispatch # :nodoc:
     # If a character set has been defined for this response (see charset=) then
     # the character set information will also be included in the content type
     # information.
-    attr_accessor :charset, :content_type
+    attr_accessor :charset
+    attr_reader   :content_type
 
     CONTENT_TYPE = "Content-Type".freeze
     SET_COOKIE   = "Set-Cookie".freeze
     LOCATION     = "Location".freeze
- 
+
     cattr_accessor(:default_charset) { "utf-8" }
 
     include Rack::Response::Helpers
@@ -83,6 +84,10 @@ module ActionDispatch # :nodoc:
       @status = Rack::Utils.status_code(status)
     end
 
+    def content_type=(content_type)
+      @content_type = content_type.to_s
+    end
+
     # The response code of the request
     def response_code
       @status
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 63b7422287..9073e6582d 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -39,6 +39,7 @@ module ActionDispatch
     end
 
     def escape_glob_chars(path)
+      path.force_encoding('binary') if path.respond_to? :force_encoding
       path.gsub(/[*?{}\[\]]/, "\\\\\\&")
     end
   end
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index cd215034dc..cdc29fb304 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,6 +1,6 @@
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/inclusion'
+require 'active_support/core_ext/enumerable'
 require 'active_support/inflector'
 require 'action_dispatch/routing/redirection'
 
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 094cfbfc76..a5e7a8c715 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -83,7 +83,7 @@ module ActionDispatch
             refer
           else
             @controller.url_for(fragment)
-          end.gsub(/[\r\n]/, '')
+          end.gsub(/[\0\r\n]/, '')
         end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 54e3032298..43d5cf1471 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -56,10 +56,10 @@ module ActionView
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
-    #     <input id="person_first_name" name="person[first_name]" size="30" type="text" /><br />
+    #     <input id="person_first_name" name="person[first_name]" type="text" /><br />
     #
     #     <label for="person_last_name">Last name</label>:
-    #     <input id="person_last_name" name="person[last_name]" size="30" type="text" /><br />
+    #     <input id="person_last_name" name="person[last_name]" type="text" /><br />
     #
     #     <input name="commit" type="submit" value="Create Person" />
     #   </form>
@@ -87,10 +87,10 @@ module ActionView
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
-    #     <input id="person_first_name" name="person[first_name]" size="30" type="text" value="John" /><br />
+    #     <input id="person_first_name" name="person[first_name]" type="text" value="John" /><br />
     #
     #     <label for="person_last_name">Last name</label>:
-    #     <input id="person_last_name" name="person[last_name]" size="30" type="text" value="Smith" /><br />
+    #     <input id="person_last_name" name="person[last_name]" type="text" value="Smith" /><br />
     #
     #     <input name="commit" type="submit" value="Update Person" />
     #   </form>
@@ -932,20 +932,20 @@ module ActionView
       # ==== Examples
       #
       #   search_field(:user, :name)
-      #   # => <input id="user_name" name="user[name]" size="30" type="search" />
+      #   # => <input id="user_name" name="user[name]" type="search" />
       #   search_field(:user, :name, :autosave => false)
-      #   # => <input autosave="false" id="user_name" name="user[name]" size="30" type="search" />
+      #   # => <input autosave="false" id="user_name" name="user[name]" type="search" />
       #   search_field(:user, :name, :results => 3)
-      #   # => <input id="user_name" name="user[name]" results="3" size="30" type="search" />
+      #   # => <input id="user_name" name="user[name]" results="3" type="search" />
       #   #  Assume request.host returns "www.example.com"
       #   search_field(:user, :name, :autosave => true)
-      #   # => <input autosave="com.example.www" id="user_name" name="user[name]" results="10" size="30" type="search" />
+      #   # => <input autosave="com.example.www" id="user_name" name="user[name]" results="10" type="search" />
       #   search_field(:user, :name, :onsearch => true)
-      #   # => <input id="user_name" incremental="true" name="user[name]" onsearch="true" size="30" type="search" />
+      #   # => <input id="user_name" incremental="true" name="user[name]" onsearch="true" type="search" />
       #   search_field(:user, :name, :autosave => false, :onsearch => true)
-      #   # => <input autosave="false" id="user_name" incremental="true" name="user[name]" onsearch="true" size="30" type="search" />
+      #   # => <input autosave="false" id="user_name" incremental="true" name="user[name]" onsearch="true" type="search" />
       #   search_field(:user, :name, :autosave => true, :onsearch => true)
-      #   # => <input autosave="com.example.www" id="user_name" incremental="true" name="user[name]" onsearch="true" results="10" size="30" type="search" />
+      #   # => <input autosave="com.example.www" id="user_name" incremental="true" name="user[name]" onsearch="true" results="10" type="search" />
       #
       def search_field(object_name, method, options = {})
         Tags::SearchField.new(object_name, method, self, options).render
@@ -954,7 +954,7 @@ module ActionView
       # Returns a text_field of type "tel".
       #
       #   telephone_field("user", "phone")
-      #   # => <input id="user_phone" name="user[phone]" size="30" type="tel" />
+      #   # => <input id="user_phone" name="user[phone]" type="tel" />
       #
       def telephone_field(object_name, method, options = {})
         Tags::TelField.new(object_name, method, self, options).render
@@ -982,7 +982,7 @@ module ActionView
       # Returns a text_field of type "url".
       #
       #   url_field("user", "homepage")
-      #   # => <input id="user_homepage" size="30" name="user[homepage]" type="url" />
+      #   # => <input id="user_homepage" name="user[homepage]" type="url" />
       #
       def url_field(object_name, method, options = {})
         Tags::UrlField.new(object_name, method, self, options).render
@@ -991,7 +991,7 @@ module ActionView
       # Returns a text_field of type "email".
       #
       #   email_field("user", "address")
-      #   # => <input id="user_address" size="30" name="user[address]" type="email" />
+      #   # => <input id="user_address" name="user[address]" type="email" />
       #
       def email_field(object_name, method, options = {})
         Tags::EmailField.new(object_name, method, self, options).render
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 5be3da9b94..d61c2bbee2 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -153,6 +153,8 @@ module ActionView
       # form, and parameters extraction gets the last occurrence of any repeated
       # key in the query string, that works for ordinary forms.
       #
+      # In case if you don't want the helper to generate this hidden field you can specify <tt>:include_blank => false</tt> option.
+      #
       def select(object, method, choices, options = {}, html_options = {})
         Tags::Select.new(object, method, self, choices, options, html_options).render
       end
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 9fad30a48f..41d895c15e 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -27,7 +27,9 @@ module ActionView
       #   is added to simulate the verb over post.
       # * <tt>:authenticity_token</tt> - Authenticity token to use in the form. Use only if you need to
       #   pass custom authenticity token string, or to not add authenticity_token field at all
-      #   (by passing <tt>false</tt>).
+      #   (by passing <tt>false</tt>). If this is a remote form, the authenticity_token will by default
+      #   not be included as the ajax handler will get it from the meta-tag (but you can force it to be
+      #   rendered anyway in that case by passing <tt>true</tt>).
       # * A list of parameters to feed to the URL the form will be posted to.
       # * <tt>:remote</tt> - If set to true, will allow the Unobtrusive JavaScript drivers to control the
       #   submit behavior. By default this behavior is an ajax submit.
@@ -616,8 +618,17 @@ module ActionView
             # responsibility of the caller to escape all the values.
             html_options["action"]  = url_for(url_for_options)
             html_options["accept-charset"] = "UTF-8"
+            
             html_options["data-remote"] = true if html_options.delete("remote")
-            html_options["authenticity_token"] = html_options.delete("authenticity_token") if html_options.has_key?("authenticity_token")
+
+            if html_options["data-remote"] && html_options["authenticity_token"] == true
+              # Include the default authenticity_token, which is only generated when its set to nil,
+              # but we needed the true value to override the default of no authenticity_token on data-remote.
+              html_options["authenticity_token"] = nil
+            elsif html_options["data-remote"]
+              # The authenticity token is taken from the meta tag in this case
+              html_options["authenticity_token"] = false
+            end
           end
         end
 
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index ac9e530f01..d88f5babb9 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -14,6 +14,8 @@ module ActionView
       }
 
       JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '&#x2028;'
+      JS_ESCAPE_MAP["\342\200\251".force_encoding('UTF-8').encode!] = '&#x2029;'
+      
 
       # Escapes carriage returns and single and double quotes for JavaScript segments.
       #
@@ -22,7 +24,7 @@ module ActionView
       #   $('some_element').replaceWith('<%=j render 'some/element_template' %>');
       def escape_javascript(javascript)
         if javascript
-          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
+          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
           javascript.html_safe? ? result.html_safe : result
         else
           ''
diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb
index 22c16de057..7c2f12d8e7 100644
--- a/actionpack/lib/action_view/helpers/tags/base.rb
+++ b/actionpack/lib/action_view/helpers/tags/base.rb
@@ -5,8 +5,6 @@ module ActionView
         include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
         include FormOptionsHelper
 
-        DEFAULT_FIELD_OPTIONS = { "size" => 30 }
-
         attr_reader :object
 
         def initialize(object_name, method_name, template_object, options = {})
@@ -124,7 +122,8 @@ module ActionView
           html_options = html_options.stringify_keys
           add_default_name_and_id(html_options)
           select = content_tag("select", add_options(option_tags, options, value(object)), html_options)
-          if html_options["multiple"]
+
+          if html_options["multiple"] && options.fetch(:include_hidden) { true }
             tag("input", :disabled => html_options["disabled"], :name => html_options["name"], :type => "hidden", :value => "") + select
           else
             select
diff --git a/actionpack/lib/action_view/helpers/tags/check_box.rb b/actionpack/lib/action_view/helpers/tags/check_box.rb
index 579cdb9fc9..1a4aebb936 100644
--- a/actionpack/lib/action_view/helpers/tags/check_box.rb
+++ b/actionpack/lib/action_view/helpers/tags/check_box.rb
@@ -25,9 +25,15 @@ module ActionView
             add_default_name_and_id(options)
           end
 
-          hidden   = hidden_field_for_checkbox(options)
+          include_hidden = options.delete("include_hidden") { true }
           checkbox = tag("input", options)
-          hidden + checkbox
+
+          if include_hidden
+            hidden = hidden_field_for_checkbox(options)
+            hidden + checkbox
+          else
+            checkbox
+          end
         end
 
         private
diff --git a/actionpack/lib/action_view/helpers/tags/text_area.rb b/actionpack/lib/action_view/helpers/tags/text_area.rb
index 461a049fc2..2e48850d5c 100644
--- a/actionpack/lib/action_view/helpers/tags/text_area.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_area.rb
@@ -2,10 +2,8 @@ module ActionView
   module Helpers
     module Tags
       class TextArea < Base #:nodoc:
-        DEFAULT_TEXT_AREA_OPTIONS = { "cols" => 40, "rows" => 20 }
-
         def render
-          options = DEFAULT_TEXT_AREA_OPTIONS.merge(@options.stringify_keys)
+          options = @options.stringify_keys
           add_default_name_and_id(options)
 
           if size = options.delete("size")
diff --git a/actionpack/lib/action_view/helpers/tags/text_field.rb b/actionpack/lib/action_view/helpers/tags/text_field.rb
index ce5182d20f..024a1a8af2 100644
--- a/actionpack/lib/action_view/helpers/tags/text_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_field.rb
@@ -4,8 +4,7 @@ module ActionView
       class TextField < Base #:nodoc:
         def render
           options = @options.stringify_keys
-          options["size"] = options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] unless options.key?("size")
-          options = DEFAULT_FIELD_OPTIONS.merge(options)
+          options["size"] = options["maxlength"] unless options.key?("size")
           options["type"]  ||= field_type
           options["value"] = options.fetch("value"){ value_before_type_cast(object) } unless field_type == "file"
           options["value"] &&= ERB::Util.html_escape(options["value"])
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index f4946e65b5..29f556502b 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -60,7 +60,7 @@ module ActionView
       #
       # ==== Relying on named routes
       #
-      # Passing a record (like an Active Record or Active Resource) instead of a Hash as the options parameter will
+      # Passing a record (like an Active Record) instead of a Hash as the options parameter will
       # trigger the named route for that record. The lookup will happen on the name of the class. So passing a
       # Workshop object will attempt to use the +workshop_path+ route. If you have a nested route, such as
       # +admin_workshop_path+ you'll have to call that explicitly (it's impossible for +url_for+ to guess that route).
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 7fa86866a7..8ea2e5bfe4 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -176,7 +176,7 @@ module ActionView
     end
   end
 
-  # A resolver that loads files from the filesystem. It allows to set your own
+  # A resolver that loads files from the filesystem. It allows setting your own
   # resolving pattern. Such pattern can be a glob string supported by some variables.
   #
   # ==== Examples
@@ -192,7 +192,7 @@ module ActionView
   #
   #   FileSystemResolver.new("/path/to/views", ":prefix/{:formats/,}:action{.:locale,}{.:formats,}{.:handlers,}")
   #
-  # If you don't specify pattern then the default will be used.
+  # If you don't specify a pattern then the default will be used.
   #
   # In order to use any of the customized resolvers above in a Rails application, you just need
   # to configure ActionController::Base.view_paths in an initializer, for example:
@@ -204,10 +204,10 @@ module ActionView
   #
   # ==== Pattern format and variables
   #
-  # Pattern have to be a valid glob string, and it allows you to use the
+  # Pattern has to be a valid glob string, and it allows you to use the
   # following variables:
   #
-  # * <tt>:prefix</tt> - usualy the controller path
+  # * <tt>:prefix</tt> - usually the controller path
   # * <tt>:action</tt> - name of the action
   # * <tt>:locale</tt> - possible locale versions
   # * <tt>:formats</tt> - possible request formats (for example html, json, xml...)
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
deleted file mode 100644
index 2e92fe416b..0000000000
--- a/actionpack/lib/sprockets/assets.rake
+++ /dev/null
@@ -1,105 +0,0 @@
-require "fileutils"
-
-namespace :assets do
-  def ruby_rake_task(task, fork = true)
-    env    = ENV['RAILS_ENV'] || 'production'
-    groups = ENV['RAILS_GROUPS'] || 'assets'
-    args   = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
-    args << "--trace" if Rake.application.options.trace
-    if $0 =~ /rake\.bat\Z/i
-      Kernel.exec $0, *args
-    else  
-      fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args)
-    end    
-  end
-
-  # We are currently running with no explicit bundler group
-  # and/or no explicit environment - we have to reinvoke rake to
-  # execute this task.
-  def invoke_or_reboot_rake_task(task)
-    if ENV['RAILS_GROUPS'].to_s.empty? || ENV['RAILS_ENV'].to_s.empty?
-      ruby_rake_task task
-    else
-      Rake::Task[task].invoke
-    end
-  end
-
-  desc "Compile all the assets named in config.assets.precompile"
-  task :precompile do
-    invoke_or_reboot_rake_task "assets:precompile:all"
-  end
-
-  namespace :precompile do
-    def internal_precompile(digest=nil)
-      unless Rails.application.config.assets.enabled
-        warn "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
-        exit
-      end
-
-      # Ensure that action view is loaded and the appropriate
-      # sprockets hooks get executed
-      _ = ActionView::Base
-
-      config = Rails.application.config
-      config.assets.compile = true
-      config.assets.digest  = digest unless digest.nil?
-      config.assets.digests = {}
-
-      env      = Rails.application.assets
-      target   = File.join(Rails.public_path, config.assets.prefix)
-      compiler = Sprockets::StaticCompiler.new(env,
-                                               target,
-                                               config.assets.precompile,
-                                               :manifest_path => config.assets.manifest,
-                                               :digest => config.assets.digest,
-                                               :manifest => digest.nil?)
-      compiler.compile
-    end
-
-    task :all do
-      Rake::Task["assets:precompile:primary"].invoke
-      # We need to reinvoke in order to run the secondary digestless
-      # asset compilation run - a fresh Sprockets environment is
-      # required in order to compile digestless assets as the
-      # environment has already cached the assets on the primary
-      # run.
-      ruby_rake_task("assets:precompile:nondigest", false) if Rails.application.config.assets.digest
-    end
-
-    task :primary => ["assets:cache:clean"] do
-      internal_precompile
-    end
-
-    task :nondigest => ["assets:cache:clean"] do
-      internal_precompile(false)
-    end
-  end
-
-  desc "Remove compiled assets"
-  task :clean do
-    invoke_or_reboot_rake_task "assets:clean:all"
-  end
-
-  namespace :clean do
-    task :all => ["assets:cache:clean"] do
-      config = Rails.application.config
-      public_asset_path = File.join(Rails.public_path, config.assets.prefix)
-      rm_rf public_asset_path, :secure => true
-    end
-  end
-
-  namespace :cache do
-    task :clean => ["assets:environment"] do
-      Rails.application.assets.cache.clear
-    end
-  end
-
-  task :environment do
-    if Rails.application.config.assets.initialize_on_precompile
-      Rake::Task["environment"].invoke
-    else
-      Rails.application.initialize!(:assets)
-      Sprockets::Bootstrap.new(Rails.application).run
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/bootstrap.rb b/actionpack/lib/sprockets/bootstrap.rb
deleted file mode 100644
index 395b264fe7..0000000000
--- a/actionpack/lib/sprockets/bootstrap.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Sprockets
-  class Bootstrap
-    def initialize(app)
-      @app = app
-    end
-
-    # TODO: Get rid of config.assets.enabled
-    def run
-      app, config = @app, @app.config
-      return unless app.assets
-
-      config.assets.paths.each { |path| app.assets.append_path(path) }
-
-      if config.assets.compress
-        # temporarily hardcode default JS compressor to uglify. Soon, it will work
-        # the same as SCSS, where a default plugin sets the default.
-        unless config.assets.js_compressor == false
-          app.assets.js_compressor = LazyCompressor.new { Sprockets::Compressors.registered_js_compressor(config.assets.js_compressor || :uglifier) }
-        end
-
-        unless config.assets.css_compressor == false
-          app.assets.css_compressor = LazyCompressor.new { Sprockets::Compressors.registered_css_compressor(config.assets.css_compressor) }
-        end
-      end
-
-      if config.assets.compile
-        app.routes.prepend do
-          mount app.assets => config.assets.prefix
-        end
-      end
-
-      if config.assets.digest
-        app.assets = app.assets.index
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/compressors.rb b/actionpack/lib/sprockets/compressors.rb
deleted file mode 100644
index 8b728d6570..0000000000
--- a/actionpack/lib/sprockets/compressors.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-module Sprockets
-  module Compressors
-    extend self
-
-    @@css_compressors = {}
-    @@js_compressors = {}
-    @@default_css_compressor = nil
-    @@default_js_compressor = nil
-
-    def register_css_compressor(name, klass, options = {})
-      @@default_css_compressor = name.to_sym if options[:default] || @@default_css_compressor.nil?
-      @@css_compressors[name.to_sym] = { :klass => klass.to_s, :require => options[:require] }
-    end
-
-    def register_js_compressor(name, klass, options = {})
-      @@default_js_compressor = name.to_sym if options[:default] || @@default_js_compressor.nil?
-      @@js_compressors[name.to_sym] = { :klass => klass.to_s, :require => options[:require] }
-    end
-
-    def registered_css_compressor(name)
-      find_registered_compressor name, @@css_compressors, @@default_css_compressor
-    end
-
-    def registered_js_compressor(name)
-      find_registered_compressor name, @@js_compressors, @@default_js_compressor
-    end
-
-    # The default compressors must be registered in default plugins (ex. Sass-Rails)
-    register_css_compressor(:scss, 'Sass::Rails::Compressor', :require => 'sass/rails/compressor', :default => true)
-    register_js_compressor(:uglifier, 'Uglifier', :require => 'uglifier', :default => true)
-
-    # Automaticaly register some compressors
-    register_css_compressor(:yui, 'YUI::CssCompressor', :require => 'yui/compressor')
-    register_js_compressor(:closure, 'Closure::Compiler', :require => 'closure-compiler')
-    register_js_compressor(:yui, 'YUI::JavaScriptCompressor', :require => 'yui/compressor')
-
-    private
-
-    def find_registered_compressor(name, compressors_hash, default_compressor_name)
-      if name.respond_to?(:to_sym)
-        compressor = compressors_hash[name.to_sym] || compressors_hash[default_compressor_name]
-        require compressor[:require] if compressor[:require]
-        compressor[:klass].constantize.new
-      else
-        name
-      end
-    end
-  end
-
-  # An asset compressor which does nothing.
-  #
-  # This compressor simply returns the asset as-is, without any compression
-  # whatsoever. It is useful in development mode, when compression isn't
-  # needed but using the same asset pipeline as production is desired.
-  class NullCompressor #:nodoc:
-    def compress(content)
-      content
-    end
-  end
-
-  # An asset compressor which only initializes the underlying compression
-  # engine when needed.
-  #
-  # This postpones the initialization of the compressor until
-  # <code>#compress</code> is called the first time.
-  class LazyCompressor #:nodoc:
-    # Initializes a new LazyCompressor.
-    #
-    # The block should return a compressor when called, i.e. an object
-    # which responds to <code>#compress</code>.
-    def initialize(&block)
-      @block = block
-    end
-
-    def compress(content)
-      compressor.compress(content)
-    end
-
-    private
-
-    def compressor
-      @compressor ||= (@block.call || NullCompressor.new)
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/helpers.rb b/actionpack/lib/sprockets/helpers.rb
deleted file mode 100644
index fee48386e0..0000000000
--- a/actionpack/lib/sprockets/helpers.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Sprockets
-  module Helpers
-    autoload :RailsHelper,    "sprockets/helpers/rails_helper"
-    autoload :IsolatedHelper, "sprockets/helpers/isolated_helper"
-  end
-end
diff --git a/actionpack/lib/sprockets/helpers/isolated_helper.rb b/actionpack/lib/sprockets/helpers/isolated_helper.rb
deleted file mode 100644
index 3adb928c45..0000000000
--- a/actionpack/lib/sprockets/helpers/isolated_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Sprockets
-  module Helpers
-    module IsolatedHelper
-      def controller
-        nil
-      end
-
-      def config
-        Rails.application.config.action_controller
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
deleted file mode 100644
index 839ec7635f..0000000000
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-require "action_view"
-
-module Sprockets
-  module Helpers
-    module RailsHelper
-      extend ActiveSupport::Concern
-      include ActionView::Helpers::AssetTagHelper
-
-      def asset_paths
-        @asset_paths ||= begin
-          paths = RailsHelper::AssetPaths.new(config, controller)
-          paths.asset_environment = asset_environment
-          paths.asset_digests     = asset_digests
-          paths.compile_assets    = compile_assets?
-          paths.digest_assets     = digest_assets?
-          paths
-        end
-      end
-
-      def javascript_include_tag(*sources)
-        options = sources.extract_options!
-        debug   = options.delete(:debug)  { debug_assets? }
-        body    = options.delete(:body)   { false }
-        digest  = options.delete(:digest) { digest_assets? }
-
-        sources.collect do |source|
-          if debug && asset = asset_paths.asset_for(source, 'js')
-            asset.to_a.map { |dep|
-              super(dep.pathname.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
-            }
-          else
-            super(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
-          end
-        end.join("\n").html_safe
-      end
-
-      def stylesheet_link_tag(*sources)
-        options = sources.extract_options!
-        debug   = options.delete(:debug)  { debug_assets? }
-        body    = options.delete(:body)   { false }
-        digest  = options.delete(:digest) { digest_assets? }
-
-        sources.collect do |source|
-          if debug && asset = asset_paths.asset_for(source, 'css')
-            asset.to_a.map { |dep|
-              super(dep.pathname.to_s, { :href => path_to_asset(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
-            }
-          else
-            super(source.to_s, { :href => path_to_asset(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
-          end
-        end.join("\n").html_safe
-      end
-
-      def asset_path(source, options = {})
-        source = source.logical_path if source.respond_to?(:logical_path)
-        path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
-        options[:body] ? "#{path}?body=1" : path
-      end
-      alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
-
-      def image_path(source)
-        path_to_asset(source)
-      end
-      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
-
-      def font_path(source)
-        path_to_asset(source)
-      end
-      alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
-
-      def javascript_path(source)
-        path_to_asset(source, :ext => 'js')
-      end
-      alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route
-
-      def stylesheet_path(source)
-        path_to_asset(source, :ext => 'css')
-      end
-      alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
-
-    private
-      def debug_assets?
-        compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
-      rescue NoMethodError
-        false
-      end
-
-      # Override to specify an alternative prefix for asset path generation.
-      # When combined with a custom +asset_environment+, this can be used to
-      # implement themes that can take advantage of the asset pipeline.
-      #
-      # If you only want to change where the assets are mounted, refer to
-      # +config.assets.prefix+ instead.
-      def asset_prefix
-        Rails.application.config.assets.prefix
-      end
-
-      def asset_digests
-        Rails.application.config.assets.digests
-      end
-
-      def compile_assets?
-        Rails.application.config.assets.compile
-      end
-
-      def digest_assets?
-        Rails.application.config.assets.digest
-      end
-
-      # Override to specify an alternative asset environment for asset
-      # path generation. The environment should already have been mounted
-      # at the prefix returned by +asset_prefix+.
-      def asset_environment
-        Rails.application.assets
-      end
-
-      class AssetPaths < ::ActionView::AssetPaths #:nodoc:
-        attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets, :digest_assets
-
-        class AssetNotPrecompiledError < StandardError; end
-
-        def asset_for(source, ext)
-          source = source.to_s
-          return nil if is_uri?(source)
-          source = rewrite_extension(source, nil, ext)
-          asset_environment[source]
-        rescue Sprockets::FileOutsidePaths
-          nil
-        end
-
-        def digest_for(logical_path)
-          if digest_assets && asset_digests && (digest = asset_digests[logical_path])
-            return digest
-          end
-
-          if compile_assets
-            if digest_assets && asset = asset_environment[logical_path]
-              return asset.digest_path
-            end
-            return logical_path
-          else
-            raise AssetNotPrecompiledError.new("#{logical_path} isn't precompiled")
-          end
-        end
-
-        def rewrite_asset_path(source, dir, options = {})
-          if source[0] == ?/
-            source
-          else
-            source = digest_for(source) unless options[:digest] == false
-            source = File.join(dir, source)
-            source = "/#{source}" unless source =~ /^\//
-            source
-          end
-        end
-
-        def rewrite_extension(source, dir, ext)
-          if ext && File.extname(source) != ".#{ext}"
-            "#{source}.#{ext}"
-          else
-            source
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
deleted file mode 100644
index 2bc482a39d..0000000000
--- a/actionpack/lib/sprockets/railtie.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require "action_controller/railtie"
-
-module Sprockets
-  autoload :Bootstrap,      "sprockets/bootstrap"
-  autoload :Helpers,        "sprockets/helpers"
-  autoload :Compressors,    "sprockets/compressors"
-  autoload :LazyCompressor, "sprockets/compressors"
-  autoload :NullCompressor, "sprockets/compressors"
-  autoload :StaticCompiler, "sprockets/static_compiler"
-
-  # TODO: Get rid of config.assets.enabled
-  class Railtie < ::Rails::Railtie
-    rake_tasks do
-      load "sprockets/assets.rake"
-    end
-
-    initializer "sprockets.environment", :group => :all do |app|
-      config = app.config
-      next unless config.assets.enabled
-
-      require 'sprockets'
-
-      app.assets = Sprockets::Environment.new(app.root.to_s) do |env|
-        env.version = ::Rails.env + "-#{config.assets.version}"
-
-        if config.assets.logger != false
-          env.logger = config.assets.logger || ::Rails.logger
-        end
-
-        if config.assets.cache_store != false
-          env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache
-        end
-      end
-
-      if config.assets.manifest
-        path = File.join(config.assets.manifest, "manifest.yml")
-      else
-        path = File.join(Rails.public_path, config.assets.prefix, "manifest.yml")
-      end
-
-      if File.exist?(path)
-        config.assets.digests = YAML.load_file(path)
-      end
-
-      ActiveSupport.on_load(:action_view) do
-        include ::Sprockets::Helpers::RailsHelper
-        app.assets.context_class.instance_eval do
-          include ::Sprockets::Helpers::IsolatedHelper
-          include ::Sprockets::Helpers::RailsHelper
-        end
-      end
-    end
-
-    # We need to configure this after initialization to ensure we collect
-    # paths from all engines. This hook is invoked exactly before routes
-    # are compiled, and so that other Railties have an opportunity to
-    # register compressors.
-    config.after_initialize do |app|
-      Sprockets::Bootstrap.new(app).run
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/static_compiler.rb b/actionpack/lib/sprockets/static_compiler.rb
deleted file mode 100644
index 9bbb464474..0000000000
--- a/actionpack/lib/sprockets/static_compiler.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'fileutils'
-
-module Sprockets
-  class StaticCompiler
-    attr_accessor :env, :target, :paths
-
-    def initialize(env, target, paths, options = {})
-      @env = env
-      @target = target
-      @paths = paths
-      @digest = options.fetch(:digest, true)
-      @manifest = options.fetch(:manifest, true)
-      @manifest_path = options.delete(:manifest_path) || target
-      @zip_files = options.delete(:zip_files) || /\.(?:css|html|js|svg|txt|xml)$/
-    end
-
-    def compile
-      manifest = {}
-      env.each_logical_path do |logical_path|
-        next unless compile_path?(logical_path)
-        if asset = env.find_asset(logical_path)
-          manifest[logical_path] = write_asset(asset)
-        end
-      end
-      write_manifest(manifest) if @manifest
-    end
-
-    def write_manifest(manifest)
-      FileUtils.mkdir_p(@manifest_path)
-      File.open("#{@manifest_path}/manifest.yml", 'wb') do |f|
-        YAML.dump(manifest, f)
-      end
-    end
-
-    def write_asset(asset)
-      path_for(asset).tap do |path|
-        filename = File.join(target, path)
-        FileUtils.mkdir_p File.dirname(filename)
-        asset.write_to(filename)
-        asset.write_to("#{filename}.gz") if filename.to_s =~ @zip_files
-      end
-    end
-
-    def compile_path?(logical_path)
-      paths.each do |path|
-        case path
-        when Regexp
-          return true if path.match(logical_path)
-        when Proc
-          return true if path.call(logical_path)
-        else
-          return true if File.fnmatch(path.to_s, logical_path)
-        end
-      end
-      false
-    end
-
-    def path_for(asset)
-      @digest ? asset.digest_path : asset.logical_path
-    end
-  end
-end
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index bf068aedcd..62f82a4c7a 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'set'
 
 module AbstractController
   module Testing
@@ -28,7 +29,7 @@ module AbstractController
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include ::AbstractController::Rendering
+      include AbstractController::Rendering
 
       def _prefixes
         []
@@ -152,7 +153,7 @@ module AbstractController
     # ====
     # self._layout is used when defined
     class WithLayouts < PrefixedViews
-      include Layouts
+      include AbstractController::Layouts
 
       private
       def self.layout(formats)
@@ -254,7 +255,7 @@ module AbstractController
     class TestActionMethodsReloading < ActiveSupport::TestCase
 
       test "action_methods should be reloaded after defining a new method" do
-        assert_equal ["index"], Me6.action_methods
+        assert_equal Set.new(["index"]), Me6.action_methods
       end
     end
 
diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
index 2ebcebbbb7..c14d24905b 100644
--- a/actionpack/test/abstract/collector_test.rb
+++ b/actionpack/test/abstract/collector_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 module AbstractController
   module Testing
     class MyCollector
-      include Collector
+      include AbstractController::Collector
       attr_accessor :responses
 
       def initialize
@@ -54,4 +54,4 @@ module AbstractController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index b28a5b5afb..9a7445de7b 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -7,7 +7,7 @@ module AbstractController
 
     class ControllerWithHelpers < AbstractController::Base
       include AbstractController::Rendering
-      include Helpers
+      include AbstractController::Helpers
 
       def with_module
         render :inline => "Module <%= included_method %>"
@@ -44,7 +44,7 @@ module AbstractController
 
     class AbstractHelpersBlock < ControllerWithHelpers
       helper do
-        include ::AbstractController::Testing::HelperyTest
+        include AbstractController::Testing::HelperyTest
       end
     end
 
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index e07a6de4a9..58795aa327 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -72,6 +72,27 @@ module AbstractControllerTests
       end
     end
 
+    class WithZeroArityProc < Base
+      layout proc { "overwrite" }
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello zero arity proc!")
+      end
+    end
+
+    class WithProcInContextOfInstance < Base
+      def an_instance_method; end
+
+      layout proc {
+        break unless respond_to? :an_instance_method
+        "overwrite"
+      }
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello again zero arity proc!")
+      end
+    end
+
     class WithSymbol < Base
       layout :hello
 
@@ -221,6 +242,18 @@ module AbstractControllerTests
         assert_equal "Overwrite Hello proc!", controller.response_body
       end
 
+      test "when layout is specified as a proc without parameters it works just the same" do
+        controller = WithZeroArityProc.new
+        controller.process(:index)
+        assert_equal "Overwrite Hello zero arity proc!", controller.response_body
+      end
+
+      test "when layout is specified as a proc without parameters the block is evaluated in the context of an instance" do
+        controller = WithProcInContextOfInstance.new
+        controller.process(:index)
+        assert_equal "Overwrite Hello again zero arity proc!", controller.response_body
+      end
+
       test "when layout is specified as a symbol, call the requested method and use the layout returned" do
         controller = WithSymbol.new
         controller.process(:index)
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 7d0609751f..2d4083252e 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -130,8 +130,6 @@ class PerformActionTest < ActionController::TestCase
     @request     = ActionController::TestRequest.new
     @response    = ActionController::TestResponse.new
     @request.host = "www.nextangle.com"
-
-    rescue_action_in_public!
   end
 
   def test_process_should_be_precise
@@ -155,7 +153,6 @@ class UrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_url_for_query_params_included
@@ -195,7 +192,6 @@ class UrlOptionsTest < ActionController::TestCase
         match "account/overview"
       end
 
-      @controller.class.send(:include, set.url_helpers)
       assert !@controller.class.action_methods.include?("account_overview_path")
     end
   end
@@ -207,7 +203,6 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_default_url_options_override
@@ -258,7 +253,6 @@ class EmptyUrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index a91e3cafa5..828ea5b0fb 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -274,6 +274,6 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
   end
 
   def decode_credentials(header)
-    ActionController::HttpAuthentication::Digest.decode_credentials(@response.headers['WWW-Authenticate'])
+    ActionController::HttpAuthentication::Digest.decode_credentials(header)
   end
 end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index b1d76150f8..6dab42d75d 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -103,6 +103,14 @@ class RedirectController < ActionController::Base
     redirect_to proc { {:action => "hello_world"} }
   end
 
+  def redirect_with_header_break
+    redirect_to "/lol\r\nwat"
+  end
+
+  def redirect_with_null_bytes
+    redirect_to "\000/lol\r\nwat"
+  end
+
   def rescue_errors(e) raise e end
 
   protected
@@ -120,6 +128,18 @@ class RedirectTest < ActionController::TestCase
     assert_equal "http://test.host/redirect/hello_world", redirect_to_url
   end
 
+  def test_redirect_with_header_break
+    get :redirect_with_header_break
+    assert_response :redirect
+    assert_equal "http://test.host/lolwat", redirect_to_url
+  end
+
+  def test_redirect_with_null_bytes
+    get :redirect_with_null_bytes
+    assert_response :redirect
+    assert_equal "http://test.host/lolwat", redirect_to_url
+  end
+
   def test_redirect_with_no_status
     get :simple_redirect
     assert_response 302
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 8167fc2fd2..09d9e65d38 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -559,6 +559,23 @@ class TestController < ActionController::Base
     render :template => "test/hello_world"
   end
 
+  def render_to_string_with_template_and_html_partial
+    @text = render_to_string :template => "test/with_partial", :formats => [:text]
+    @html = render_to_string :template => "test/with_partial", :formats => [:html]
+    render :template => "test/with_html_partial"
+  end
+
+  def render_to_string_and_render_with_different_formats
+    @html = render_to_string :template => "test/with_partial", :formats => [:html]
+    render :template => "test/with_partial", :formats => [:text]
+  end
+
+  def render_template_within_a_template_with_other_format
+    render  :template => "test/with_xml_template",
+            :formats  => [:html],
+            :layout   => "with_html_partial"
+  end
+
   def partial_with_counter
     render :partial => "counter", :locals => { :counter_counter => 5 }
   end
@@ -1268,6 +1285,28 @@ class RenderTest < ActionController::TestCase
     assert_equal "text/html", @response.content_type
   end
 
+  def test_render_to_string_with_template_and_html_partial
+    get :render_to_string_with_template_and_html_partial
+    assert_equal "**only partial**\n", assigns(:text)
+    assert_equal "<strong>only partial</strong>\n", assigns(:html)
+    assert_equal "<strong>only html partial</strong>\n", @response.body
+    assert_equal "text/html", @response.content_type
+  end
+
+  def test_render_to_string_and_render_with_different_formats
+    get :render_to_string_and_render_with_different_formats
+    assert_equal "<strong>only partial</strong>\n", assigns(:html)
+    assert_equal "**only partial**\n", @response.body
+    assert_equal "text/plain", @response.content_type
+  end
+
+  def test_render_template_within_a_template_with_other_format
+    get :render_template_within_a_template_with_other_format
+    expected = "only html partial<p>This is grand!</p>"
+    assert_equal expected, @response.body.strip
+    assert_equal "text/html", @response.content_type
+  end
+
   def test_partial_with_counter
     get :partial_with_counter
     assert_equal "5", @response.body
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 64ed7f667f..7b722bd3d7 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -35,6 +35,16 @@ module RequestForgeryProtectionActions
   def form_for_without_protection
     render :inline => "<%= form_for(:some_resource, :authenticity_token => false ) {} %>"
   end
+
+  def form_for_remote
+    render :inline => "<%= form_for(:some_resource, :remote => true ) {} %>"
+  end
+
+  def form_for_remote_with_token
+    render :inline => "<%= form_for(:some_resource, :remote => true, :authenticity_token => true ) {} %>"
+  end
+
+  def rescue_action(e) raise e end
 end
 
 # sample controllers
@@ -43,7 +53,7 @@ class RequestForgeryProtectionController < ActionController::Base
   protect_from_forgery :only => %w(index meta)
 end
 
-class RequestForgeryProtectionControllerUsingOldBehaviour < ActionController::Base
+class RequestForgeryProtectionControllerUsingException < ActionController::Base
   include RequestForgeryProtectionActions
   protect_from_forgery :only => %w(index meta)
 
@@ -98,6 +108,20 @@ module RequestForgeryProtectionTests
     assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', @token
   end
 
+  def test_should_render_form_without_token_tag_if_remote
+    assert_not_blocked do
+      get :form_for_remote
+    end
+    assert_no_match(/authenticity_token/, response.body)
+  end
+
+  def test_should_render_form_with_token_tag_if_remote_and_authenticity_token_requested
+    assert_not_blocked do
+      get :form_for_remote_with_token
+    end
+    assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', @token
+  end
+
   def test_should_allow_get
     assert_not_blocked { get :index }
   end
@@ -215,7 +239,7 @@ class RequestForgeryProtectionControllerTest < ActionController::TestCase
   end
 end
 
-class RequestForgeryProtectionControllerUsingOldBehaviourTest < ActionController::TestCase
+class RequestForgeryProtectionControllerUsingExceptionTest < ActionController::TestCase
   include RequestForgeryProtectionTests
   def assert_blocked
     assert_raises(ActionController::InvalidAuthenticityToken) do
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 36884846be..3af17f495c 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -23,10 +23,6 @@ class SendFileController < ActionController::Base
   def data
     send_data(file_data, options)
   end
-
-  def multibyte_text_data
-    send_data("Кирилица\n祝您好運.", options)
-  end
 end
 
 class SendFileTest < ActionController::TestCase
diff --git a/actionpack/test/controller/sweeper_test.rb b/actionpack/test/controller/sweeper_test.rb
new file mode 100644
index 0000000000..0561efc62f
--- /dev/null
+++ b/actionpack/test/controller/sweeper_test.rb
@@ -0,0 +1,16 @@
+require 'abstract_unit'
+
+
+class SweeperTest < ActionController::TestCase
+
+  class ::AppSweeper < ActionController::Caching::Sweeper; end
+
+  def test_sweeper_should_not_ignore_unknown_method_calls
+    sweeper = ActionController::Caching::Sweeper.send(:new)
+    assert_raise NameError do
+      sweeper.instance_eval do
+        some_method_that_doesnt_exist
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 092ca3e20a..112f470786 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -7,6 +7,10 @@ module StaticTests
     assert_equal "Hello, World!", get("/nofile").body
   end
 
+  def test_handles_urls_with_bad_encoding
+    assert_equal "Hello, World!", get("/doorkeeper%E3E4").body
+  end
+
   def test_sets_cache_control
     response = get("/index.html")
     assert_html "/index.html", response
diff --git a/actionpack/test/fixtures/layouts/with_html_partial.html.erb b/actionpack/test/fixtures/layouts/with_html_partial.html.erb
new file mode 100644
index 0000000000..fd2896aeaa
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/with_html_partial.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "partial_only_html" %><%= yield %>
diff --git a/actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css b/actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
deleted file mode 100644
index bfb90bfa48..0000000000
--- a/actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Different from other style.css */
\ No newline at end of file
diff --git a/actionpack/test/fixtures/sprockets/app/fonts/dir/font.ttf b/actionpack/test/fixtures/sprockets/app/fonts/dir/font.ttf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/fonts/dir/font.ttf
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/fonts/font.ttf b/actionpack/test/fixtures/sprockets/app/fonts/font.ttf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/fonts/font.ttf
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/images/logo.png b/actionpack/test/fixtures/sprockets/app/images/logo.png
deleted file mode 100644
index d5edc04e65..0000000000
--- a/actionpack/test/fixtures/sprockets/app/images/logo.png
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/application.js b/actionpack/test/fixtures/sprockets/app/javascripts/application.js
deleted file mode 100644
index e611d2b129..0000000000
--- a/actionpack/test/fixtures/sprockets/app/javascripts/application.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require xmlhr
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js b/actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js b/actionpack/test/fixtures/sprockets/app/javascripts/extra.js
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js b/actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/application.css b/actionpack/test/fixtures/sprockets/app/stylesheets/application.css
deleted file mode 100644
index 2365eaa4cd..0000000000
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/application.css
+++ /dev/null
@@ -1 +0,0 @@
-/*= require style */
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css b/actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css b/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/style.css b/actionpack/test/fixtures/sprockets/app/stylesheets/style.css
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/style.css
+++ /dev/null
diff --git a/actionpack/test/fixtures/test/_partial_only_html.html b/actionpack/test/fixtures/test/_partial_only_html.html
new file mode 100644
index 0000000000..d2d630bd40
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_only_html.html
@@ -0,0 +1 @@
+only html partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/with_html_partial.html.erb b/actionpack/test/fixtures/test/with_html_partial.html.erb
new file mode 100644
index 0000000000..d84d909d64
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_html_partial.html.erb
@@ -0,0 +1 @@
+<strong><%= render :partial => "partial_only_html" %></strong>
diff --git a/actionpack/test/fixtures/test/with_partial.html.erb b/actionpack/test/fixtures/test/with_partial.html.erb
new file mode 100644
index 0000000000..7502364cf5
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_partial.html.erb
@@ -0,0 +1 @@
+<strong><%= render :partial => "partial_only" %></strong>
diff --git a/actionpack/test/fixtures/test/with_partial.text.erb b/actionpack/test/fixtures/test/with_partial.text.erb
new file mode 100644
index 0000000000..5f068ebf27
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_partial.text.erb
@@ -0,0 +1 @@
+**<%= render :partial => "partial_only" %>**
diff --git a/actionpack/test/fixtures/test/with_xml_template.html.erb b/actionpack/test/fixtures/test/with_xml_template.html.erb
new file mode 100644
index 0000000000..e54a7cd001
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_xml_template.html.erb
@@ -0,0 +1 @@
+<%= render :template => "test/greeting", :formats => :xml %>
diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index 66a7bce71e..18468ee91a 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -29,14 +29,14 @@ class ActiveModelHelperTest < ActionView::TestCase
 
   def test_text_area_with_errors
     assert_dom_equal(
-      %(<div class="field_with_errors"><textarea cols="40" id="post_body" name="post[body]" rows="20">\nBack to the hill and over it again!</textarea></div>),
+      %(<div class="field_with_errors"><textarea id="post_body" name="post[body]">\nBack to the hill and over it again!</textarea></div>),
       text_area("post", "body")
     )
   end
 
   def test_text_field_with_errors
     assert_dom_equal(
-      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" size="30" type="text" value="" /></div>),
+      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" type="text" value="" /></div>),
       text_field("post", "author_name")
     )
   end
@@ -76,7 +76,7 @@ class ActiveModelHelperTest < ActionView::TestCase
     end
 
     assert_dom_equal(
-      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" size="30" type="text" value="" /> <span class="error">can't be empty</span></div>),
+      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" type="text" value="" /> <span class="error">can't be empty</span></div>),
       text_field("post", "author_name")
     )
   ensure
diff --git a/actionpack/test/template/compressors_test.rb b/actionpack/test/template/compressors_test.rb
deleted file mode 100644
index a273f15bd7..0000000000
--- a/actionpack/test/template/compressors_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'abstract_unit'
-require 'sprockets/compressors'
-
-class CompressorsTest < ActiveSupport::TestCase
-  def test_register_css_compressor
-    Sprockets::Compressors.register_css_compressor(:null, Sprockets::NullCompressor)
-    compressor = Sprockets::Compressors.registered_css_compressor(:null)
-    assert_kind_of Sprockets::NullCompressor, compressor
-  end
-
-  def test_register_js_compressor
-    Sprockets::Compressors.register_js_compressor(:uglifier, 'Uglifier', :require => 'uglifier')
-    compressor = Sprockets::Compressors.registered_js_compressor(:uglifier)
-    assert_kind_of Uglifier, compressor
-  end
-
-  def test_register_default_css_compressor
-    Sprockets::Compressors.register_css_compressor(:null, Sprockets::NullCompressor, :default => true)
-    compressor = Sprockets::Compressors.registered_css_compressor(:default)
-    assert_kind_of Sprockets::NullCompressor, compressor
-  end
-
-  def test_register_default_js_compressor
-    Sprockets::Compressors.register_js_compressor(:null, Sprockets::NullCompressor, :default => true)
-    compressor = Sprockets::Compressors.registered_js_compressor(:default)
-    assert_kind_of Sprockets::NullCompressor, compressor
-  end
-end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 4eed5615f6..2bdb54bd5e 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -249,35 +249,35 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_label_with_block_in_erb
-    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")
+    assert_equal "<label for=\"post_message\">\n  Message\n  <input id=\"post_message\" name=\"post[message]\" type=\"text\" />\n</label>", view.render("test/label_with_block")
   end
 
   def test_text_field
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title")
+      '<input id="post_title" name="post[title]" type="text" value="Hello World" />', text_field("post", "title")
     )
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="password" />', password_field("post", "title")
+      '<input id="post_title" name="post[title]" type="password" />', password_field("post", "title")
     )
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="password" value="Hello World" />', password_field("post", "title", :value => @post.title)
+      '<input id="post_title" name="post[title]" type="password" value="Hello World" />', password_field("post", "title", :value => @post.title)
     )
     assert_dom_equal(
-      '<input id="person_name" name="person[name]" size="30" type="password" />', password_field("person", "name")
+      '<input id="person_name" name="person[name]" type="password" />', password_field("person", "name")
     )
   end
 
   def test_text_field_with_escapes
     @post.title = "<b>Hello World</b>"
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />', text_field("post", "title")
+      '<input id="post_title" name="post[title]" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />', text_field("post", "title")
     )
   end
 
   def test_text_field_with_html_entities
     @post.title = "The HTML Entity for & is &amp;"
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="text" value="The HTML Entity for &amp; is &amp;amp;" />',
+      '<input id="post_title" name="post[title]" type="text" value="The HTML Entity for &amp; is &amp;amp;" />',
       text_field("post", "title")
     )
   end
@@ -301,18 +301,18 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_text_field_with_nil_value
-    expected = '<input id="post_title" name="post[title]" size="30" type="text" />'
+    expected = '<input id="post_title" name="post[title]" type="text" />'
     assert_dom_equal expected, text_field("post", "title", :value => nil)
   end
 
   def test_text_field_with_nil_name
-    expected = '<input id="post_title" size="30" type="text" value="Hello World" />'
+    expected = '<input id="post_title" type="text" value="Hello World" />'
     assert_dom_equal expected, text_field("post", "title", :name => nil)
   end
 
   def test_text_field_doesnt_change_param_values
     object_name = 'post[]'
-    expected = '<input id="post_123_title" name="post[123][title]" size="30" type="text" value="Hello World" />'
+    expected = '<input id="post_123_title" name="post[123][title]" type="text" value="Hello World" />'
     assert_equal expected, text_field(object_name, "title")
     assert_equal object_name, "post[]"
   end
@@ -346,7 +346,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_text_field_with_custom_type
-    assert_dom_equal '<input id="user_email" size="30" name="user[email]" type="email" />',
+    assert_dom_equal '<input id="user_email" name="user[email]" type="email" />',
       text_field("user", "email", :type => "email")
   end
 
@@ -387,6 +387,11 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
+  def test_check_box_with_include_hidden_false
+    @post.secret = false
+    assert_dom_equal('<input id="post_secret" name="post[secret]" type="checkbox" value="1" />', check_box("post", "secret", :include_hidden => false))
+  end
+
   def test_check_box_with_explicit_checked_and_unchecked_values
     @post.secret = "on"
     assert_dom_equal(
@@ -474,7 +479,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_text_area
     assert_dom_equal(
-      %{<textarea cols="40" id="post_body" name="post[body]" rows="20">\nBack to the hill and over it again!</textarea>},
+      %{<textarea id="post_body" name="post[body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body")
     )
   end
@@ -482,14 +487,14 @@ class FormHelperTest < ActionView::TestCase
   def test_text_area_with_escapes
     @post.body        = "Back to <i>the</i> hill and over it again!"
     assert_dom_equal(
-      %{<textarea cols="40" id="post_body" name="post[body]" rows="20">\nBack to &lt;i&gt;the&lt;/i&gt; hill and over it again!</textarea>},
+      %{<textarea id="post_body" name="post[body]">\nBack to &lt;i&gt;the&lt;/i&gt; hill and over it again!</textarea>},
       text_area("post", "body")
     )
   end
 
   def test_text_area_with_alternate_value
     assert_dom_equal(
-      %{<textarea cols="40" id="post_body" name="post[body]" rows="20">\nTesting alternate values.</textarea>},
+      %{<textarea id="post_body" name="post[body]">\nTesting alternate values.</textarea>},
       text_area("post", "body", :value => 'Testing alternate values.')
     )
   end
@@ -497,7 +502,7 @@ class FormHelperTest < ActionView::TestCase
   def test_text_area_with_html_entities
     @post.body        = "The HTML Entity for & is &amp;"
     assert_dom_equal(
-      %{<textarea cols="40" id="post_body" name="post[body]" rows="20">\nThe HTML Entity for &amp; is &amp;amp;</textarea>},
+      %{<textarea id="post_body" name="post[body]">\nThe HTML Entity for &amp; is &amp;amp;</textarea>},
       text_area("post", "body")
     )
   end
@@ -510,12 +515,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_search_field
-    expected = %{<input id="contact_notes_query" size="30" name="contact[notes_query]" type="search" />}
+    expected = %{<input id="contact_notes_query" name="contact[notes_query]" type="search" />}
     assert_dom_equal(expected, search_field("contact", "notes_query"))
   end
 
   def test_telephone_field
-    expected = %{<input id="user_cell" size="30" name="user[cell]" type="tel" />}
+    expected = %{<input id="user_cell" name="user[cell]" type="tel" />}
     assert_dom_equal(expected, telephone_field("user", "cell"))
   end
 
@@ -546,12 +551,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_url_field
-    expected = %{<input id="user_homepage" size="30" name="user[homepage]" type="url" />}
+    expected = %{<input id="user_homepage" name="user[homepage]" type="url" />}
     assert_dom_equal(expected, url_field("user", "homepage"))
   end
 
   def test_email_field
-    expected = %{<input id="user_address" size="30" name="user[address]" type="email" />}
+    expected = %{<input id="user_address" name="user[address]" type="email" />}
     assert_dom_equal(expected, email_field("user", "address"))
   end
 
@@ -571,10 +576,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_explicit_name
     assert_dom_equal(
-      '<input id="post_title" name="dont guess" size="30" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
+      '<input id="post_title" name="dont guess" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
     )
     assert_dom_equal(
-      %{<textarea cols="40" id="post_body" name="really!" rows="20">\nBack to the hill and over it again!</textarea>},
+      %{<textarea id="post_body" name="really!">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "name" => "really!")
     )
     assert_dom_equal(
@@ -591,10 +596,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_explicit_id
     assert_dom_equal(
-      '<input id="dont guess" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
+      '<input id="dont guess" name="post[title]" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
     )
     assert_dom_equal(
-      %{<textarea cols="40" id="really!" name="post[body]" rows="20">\nBack to the hill and over it again!</textarea>},
+      %{<textarea id="really!" name="post[body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "id" => "really!")
     )
     assert_dom_equal(
@@ -611,10 +616,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nil_id
     assert_dom_equal(
-      '<input name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title", "id" => nil)
+      '<input name="post[title]" type="text" value="Hello World" />', text_field("post", "title", "id" => nil)
     )
     assert_dom_equal(
-      %{<textarea cols="40" name="post[body]" rows="20">\nBack to the hill and over it again!</textarea>},
+      %{<textarea name="post[body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "id" => nil)
     )
     assert_dom_equal(
@@ -641,11 +646,11 @@ class FormHelperTest < ActionView::TestCase
 
   def test_index
     assert_dom_equal(
-      '<input name="post[5][title]" size="30" id="post_5_title" type="text" value="Hello World" />',
+      '<input name="post[5][title]" id="post_5_title" type="text" value="Hello World" />',
       text_field("post", "title", "index" => 5)
     )
     assert_dom_equal(
-      %{<textarea cols="40" name="post[5][body]" id="post_5_body" rows="20">\nBack to the hill and over it again!</textarea>},
+      %{<textarea name="post[5][body]" id="post_5_body">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "index" => 5)
     )
     assert_dom_equal(
@@ -668,11 +673,11 @@ class FormHelperTest < ActionView::TestCase
 
   def test_index_with_nil_id
     assert_dom_equal(
-      '<input name="post[5][title]" size="30" type="text" value="Hello World" />',
+      '<input name="post[5][title]" type="text" value="Hello World" />',
       text_field("post", "title", "index" => 5, 'id' => nil)
     )
     assert_dom_equal(
-      %{<textarea cols="40" name="post[5][body]" rows="20">\nBack to the hill and over it again!</textarea>},
+      %{<textarea name="post[5][body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "index" => 5, 'id' => nil)
     )
     assert_dom_equal(
@@ -700,10 +705,10 @@ class FormHelperTest < ActionView::TestCase
       label("post[]", "title")
     )
     assert_dom_equal(
-      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
+      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
     )
     assert_dom_equal(
-      "<textarea cols=\"40\" id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\" rows=\"20\">\nBack to the hill and over it again!</textarea>",
+      "<textarea id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\">\nBack to the hill and over it again!</textarea>",
       text_area("post[]", "body")
     )
     assert_dom_equal(
@@ -722,11 +727,11 @@ class FormHelperTest < ActionView::TestCase
   def test_auto_index_with_nil_id
     pid = 123
     assert_dom_equal(
-      "<input name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />",
+      "<input name=\"post[#{pid}][title]\" type=\"text\" value=\"Hello World\" />",
       text_field("post[]","title", :id => nil)
     )
     assert_dom_equal(
-      "<textarea cols=\"40\" name=\"post[#{pid}][body]\" rows=\"20\">\nBack to the hill and over it again!</textarea>",
+      "<textarea name=\"post[#{pid}][body]\">\nBack to the hill and over it again!</textarea>",
       text_area("post[]", "body", :id => nil)
     )
     assert_dom_equal(
@@ -760,8 +765,8 @@ class FormHelperTest < ActionView::TestCase
 
     expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
       "<label for='post_title'>The Title</label>" +
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='commit' type='submit' value='Create post' />" +
@@ -859,7 +864,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form("/posts/44", "edit_post_44" , "edit_post", :method => 'patch') do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='And his name will be forty and four.' />" +
+      "<input name='post[title]' type='text' id='post_title' value='And his name will be forty and four.' />" +
       "<input name='commit' type='submit' value='Edit post' />"
     end
 
@@ -877,8 +882,8 @@ class FormHelperTest < ActionView::TestCase
 
     expected =  whole_form("/posts/123", "create-post", "edit_other_name", :method => 'patch') do
       "<label for='other_name_title' class='post_title'>Title</label>" +
-      "<input name='other_name[title]' size='30' id='other_name_title' value='Hello World' type='text' />" +
-      "<textarea name='other_name[body]' id='other_name_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='other_name[title]' id='other_name_title' value='Hello World' type='text' />" +
+      "<textarea name='other_name[body]' id='other_name_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='other_name[secret]' value='0' type='hidden' />" +
       "<input name='other_name[secret]' checked='checked' id='other_name_secret' value='1' type='checkbox' />" +
       "<input name='commit' value='Create post' type='submit' />"
@@ -895,8 +900,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/", "create-post", "edit_post", "delete") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -912,8 +917,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/", "create-post", "edit_post", "delete") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -929,7 +934,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/search", "search-post", "new_post", "get") do
-      "<input name='post[title]' size='30' type='search' id='post_title' />"
+      "<input name='post[title]' type='search' id='post_title' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -943,8 +948,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/", "create-post", "edit_post", :method => 'patch', :remote => true) do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -960,8 +965,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/", "create-post", "edit_post", :method => 'patch', :remote => true) do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -979,8 +984,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/posts", 'new_post', 'new_post', :remote => true) do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -996,8 +1001,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form("/", "create-post") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -1015,8 +1020,8 @@ class FormHelperTest < ActionView::TestCase
 
     expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
       "<label for='post_123_title'>Title</label>" +
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
+      "<textarea name='post[123][body]' id='post_123_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
       "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
     end
@@ -1032,8 +1037,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
-      "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
-      "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[][title]' type='text' id='post__title' value='Hello World' />" +
+      "<textarea name='post[][body]' id='post__body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
       "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
     end
@@ -1049,8 +1054,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
-      "<input name='post[title]' size='30' type='text' id='namespace_post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='namespace_post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='namespace_post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='namespace_post_secret' value='1' />"
     end
@@ -1066,7 +1071,7 @@ class FormHelperTest < ActionView::TestCase
 
     expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
       "<label for='namespace_post_title'>Title</label>" +
-      "<input name='post[title]' size='30' type='text' id='namespace_post_title' value='Hello World' />"
+      "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1080,7 +1085,7 @@ class FormHelperTest < ActionView::TestCase
 
     expected_1 = whole_form('/posts/123', 'namespace_1_edit_post_123', 'edit_post', 'patch') do
       "<label for='namespace_1_post_title'>Title</label>" +
-      "<input name='post[title]' size='30' type='text' id='namespace_1_post_title' value='Hello World' />"
+      "<input name='post[title]' type='text' id='namespace_1_post_title' value='Hello World' />"
     end
 
     assert_dom_equal expected_1, output_buffer
@@ -1092,7 +1097,7 @@ class FormHelperTest < ActionView::TestCase
 
     expected_2 = whole_form('/posts/123', 'namespace_2_edit_post_123', 'edit_post', 'patch') do
       "<label for='namespace_2_post_title'>Title</label>" +
-      "<input name='post[title]' size='30' type='text' id='namespace_2_post_title' value='Hello World' />"
+      "<input name='post[title]' type='text' id='namespace_2_post_title' value='Hello World' />"
     end
 
     assert_dom_equal expected_2, output_buffer
@@ -1109,9 +1114,9 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
-      "<input name='post[title]' size='30' type='text' id='namespace_post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='namespace_post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
-      "<input name='post[comment][body]' size='30' type='text' id='namespace_post_comment_body' value='Hello World' />"
+      "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='namespace_post_body'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[comment][body]' type='text' id='namespace_post_comment_body' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1192,7 +1197,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      "<input name='post[comment][body]' size='30' type='text' id='post_comment_body' value='Hello World' />"
+      "<input name='post[comment][body]' type='text' id='post_comment_body' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1207,8 +1212,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<input name='post[123][comment][][name]' size='30' type='text' id='post_123_comment__name' value='new comment' />"
+      "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
+      "<input name='post[123][comment][][name]' type='text' id='post_123_comment__name' value='new comment' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1223,8 +1228,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
-      "<input name='post[1][title]' size='30' type='text' id='post_1_title' value='Hello World' />" +
-      "<input name='post[1][comment][1][name]' size='30' type='text' id='post_1_comment_1_name' value='new comment' />"
+      "<input name='post[1][title]' type='text' id='post_1_title' value='Hello World' />" +
+      "<input name='post[1][comment][1][name]' type='text' id='post_1_comment_1_name' value='new comment' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1238,7 +1243,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
-      "<input name='post[1][comment][title]' size='30' type='text' id='post_1_comment_title' value='Hello World' />"
+      "<input name='post[1][comment][title]' type='text' id='post_1_comment_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1252,7 +1257,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
-      "<input name='post[1][comment][5][title]' size='30' type='text' id='post_1_comment_5_title' value='Hello World' />"
+      "<input name='post[1][comment][5][title]' type='text' id='post_1_comment_5_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1266,7 +1271,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
-      "<input name='post[123][comment][title]' size='30' type='text' id='post_123_comment_title' value='Hello World' />"
+      "<input name='post[123][comment][title]' type='text' id='post_123_comment_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1294,7 +1299,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
-      "<input name='post[123][comment][123][title]' size='30' type='text' id='post_123_comment_123_title' value='Hello World' />"
+      "<input name='post[123][comment][123][title]' type='text' id='post_123_comment_123_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1314,9 +1319,9 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
-      "<input name='post[123][comment][5][title]' size='30' type='text' id='post_123_comment_5_title' value='Hello World' />"
+      "<input name='post[123][comment][5][title]' type='text' id='post_123_comment_5_title' value='Hello World' />"
     end + whole_form('/posts/123', 'edit_post', 'edit_post', 'patch') do
-      "<input name='post[1][comment][123][title]' size='30' type='text' id='post_1_comment_123_title' value='Hello World' />"
+      "<input name='post[1][comment][123][title]' type='text' id='post_1_comment_123_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1333,8 +1338,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-        '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="new author" />'
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+        '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="new author" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1360,8 +1365,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-     '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-     '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+     '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+     '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
      '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
    end
 
@@ -1379,8 +1384,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
     end
 
@@ -1398,8 +1403,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1416,8 +1421,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1434,8 +1439,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
     end
 
@@ -1454,9 +1459,9 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1475,10 +1480,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1502,11 +1507,11 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-      '<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_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1529,10 +1534,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
-      '<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_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1555,11 +1560,11 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-      '<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_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1578,10 +1583,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1602,11 +1607,11 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input name="post[title]" 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_0_name" name="post[comments_attributes][0][name]" 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" />'
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1625,9 +1630,9 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="new comment" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="new comment" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1646,10 +1651,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1664,7 +1669,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />'
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1681,10 +1686,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1702,10 +1707,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1724,10 +1729,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1747,10 +1752,10 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1767,7 +1772,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
+      '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />'
     end
 
@@ -1803,16 +1808,16 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
-      '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="commentrelevance #314" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
+      '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" type="text" value="commentrelevance #314" />' +
       '<input id="post_comments_attributes_0_relevances_attributes_0_id" name="post[comments_attributes][0][relevances_attributes][0][id]" type="hidden" value="314" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-      '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" size="30" type="text" value="tag #123" />' +
-      '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #3141" />' +
+      '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" type="text" value="tag #123" />' +
+      '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" type="text" value="tagrelevance #3141" />' +
       '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
       '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
-      '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" size="30" type="text" value="tag #456" />' +
-      '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #31415" />' +
+      '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" type="text" value="tag #456" />' +
+      '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" type="text" value="tagrelevance #31415" />' +
       '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
       '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />'
     end
@@ -1830,7 +1835,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="hash backed author" />'
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="hash backed author" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1844,8 +1849,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
@@ -1860,8 +1865,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
+      "<textarea name='post[123][body]' id='post_123_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
       "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
 
@@ -1876,8 +1881,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
-      "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[][title]' type='text' id='post__title' value='Hello World' />" +
+      "<textarea name='post[][body]' id='post__body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
       "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
 
@@ -1892,8 +1897,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[abc][title]' size='30' type='text' id='post_abc_title' value='Hello World' />" +
-      "<textarea name='post[abc][body]' id='post_abc_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[abc][title]' type='text' id='post_abc_title' value='Hello World' />" +
+      "<textarea name='post[abc][body]' id='post_abc_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[abc][secret]' type='hidden' value='0' />" +
       "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />"
 
@@ -1908,8 +1913,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
@@ -1924,8 +1929,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
@@ -1939,7 +1944,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     assert_dom_equal "<label for=\"author_post_title\">Title</label>" +
-    "<input name='author[post][title]' size='30' type='text' id='author_post_title' value='Hello World' />",
+    "<input name='author[post][title]' type='text' id='author_post_title' value='Hello World' />",
       output_buffer
   end
 
@@ -1950,7 +1955,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     assert_dom_equal "<label for=\"author_post_1_title\">Title</label>" +
-      "<input name='author[post][1][title]' size='30' type='text' id='author_post_1_title' value='Hello World' />",
+      "<input name='author[post][1][title]' type='text' id='author_post_1_title' value='Hello World' />",
       output_buffer
   end
 
@@ -1969,8 +1974,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'patch') do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
       "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />"
     end
@@ -1989,9 +1994,9 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'patch') do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea>" +
-      "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />"
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -2005,7 +2010,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
-      "<input name='post[category][name]' type='text' size='30' id='post_category_name' />"
+      "<input name='post[category][name]' type='text' id='post_category_name' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -2029,8 +2034,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea><br/>" +
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
     end
 
@@ -2048,8 +2053,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea><br/>" +
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
     end
 
@@ -2066,8 +2071,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>\nBack to the hill and over it again!</textarea><br/>" +
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
 
     assert_dom_equal expected, output_buffer
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 606d454cb3..2c0da8473a 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -529,6 +529,14 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_with_multiple_and_without_hidden_input
+    output_buffer =  select(:post, :category, "", {:include_hidden => false}, :multiple => true)
+    assert_dom_equal(
+      "<select multiple=\"multiple\" id=\"post_category\" name=\"post[category][]\"></select>",
+      output_buffer
+    )
+  end
+
   def test_select_with_multiple_and_disabled_to_add_disabled_hidden_input
     output_buffer =  select(:post, :category, "", {}, :multiple => true, :disabled => true)
     assert_dom_equal(
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 9441bd6b38..64898f7ad1 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -28,6 +28,8 @@ class JavaScriptHelperTest < ActionView::TestCase
     assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
     assert_equal %(dont <\\/close> tags), escape_javascript(%(dont </close> tags))
     assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!)
+    assert_equal %(unicode &#x2029; newline), escape_javascript(%(unicode \342\200\251 newline).force_encoding('UTF-8').encode!)
+
     assert_equal %(dont <\\/close> tags), j(%(dont </close> tags))
   end
 
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
deleted file mode 100644
index d4d2dedfb6..0000000000
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ /dev/null
@@ -1,349 +0,0 @@
-require 'abstract_unit'
-require 'sprockets'
-require 'sprockets/helpers/rails_helper'
-require 'mocha'
-
-class SprocketsHelperTest < ActionView::TestCase
-  include Sprockets::Helpers::RailsHelper
-
-  attr_accessor :assets
-
-  class MockRequest
-    def protocol() 'http://' end
-    def ssl?() false end
-    def host_with_port() 'localhost' end
-    def script_name() nil end
-  end
-
-  def setup
-    super
-
-    @controller         = BasicController.new
-    @controller.request = MockRequest.new
-
-    @assets = Sprockets::Environment.new
-    @assets.append_path(FIXTURES.join("sprockets/app/javascripts"))
-    @assets.append_path(FIXTURES.join("sprockets/app/stylesheets"))
-    @assets.append_path(FIXTURES.join("sprockets/app/images"))
-    @assets.append_path(FIXTURES.join("sprockets/app/fonts"))
-
-    application = Struct.new(:config, :assets).new(config, @assets)
-    Rails.stubs(:application).returns(application)
-    @config = config
-    @config.perform_caching = true
-    @config.assets.digest = true
-    @config.assets.compile = true
-  end
-
-  def url_for(*args)
-    "http://www.example.com"
-  end
-
-  def config
-    @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")
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png", :digest => true)
-    assert_match %r{/assets/logo.png},
-      asset_path("logo.png", :digest => false)
-  end
-
-  test "custom_asset_path" do
-    @config.assets.prefix = '/s'
-    assert_match %r{/s/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-    assert_match %r{/s/logo-[0-9a-f]+.png},
-      asset_path("logo.png", :digest => true)
-    assert_match %r{/s/logo.png},
-      asset_path("logo.png", :digest => false)
-  end
-
-  test "asset_path with root relative assets" do
-    assert_equal "/images/logo",
-      asset_path("/images/logo")
-    assert_equal "/images/logo.gif",
-      asset_path("/images/logo.gif")
-
-    assert_equal "/dir/audio",
-      asset_path("/dir/audio")
-  end
-
-  test "asset_path with absolute urls" do
-    assert_equal "http://www.example.com/video/play",
-      asset_path("http://www.example.com/video/play")
-    assert_equal "http://www.example.com/video/play.mp4",
-      asset_path("http://www.example.com/video/play.mp4")
-  end
-
-  test "with a simple asset host the url should default to protocol relative" do
-    @controller.config.default_asset_host_protocol = :relative
-    @controller.config.asset_host = "assets-%d.example.com"
-    assert_match %r{^//assets-\d.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "with a simple asset host the url can be changed to use the request protocol" do
-    @controller.config.asset_host = "assets-%d.example.com"
-    @controller.config.default_asset_host_protocol = :request
-    assert_match %r{http://assets-\d.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "With a proc asset host that returns no protocol the url should be protocol relative" do
-    @controller.config.default_asset_host_protocol = :relative
-    @controller.config.asset_host = Proc.new do |asset|
-      "assets-999.example.com"
-    end
-    assert_match %r{^//assets-999.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "with a proc asset host that returns a protocol the url use it" do
-    @controller.config.asset_host = Proc.new do |asset|
-      "http://assets-999.example.com"
-    end
-    assert_match %r{http://assets-999.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "stylesheets served with a controller in scope can access the request" do
-    config.asset_host = Proc.new do |asset, request|
-      assert_not_nil request
-      "http://assets-666.example.com"
-    end
-    assert_match %r{http://assets-666.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "stylesheets served without a controller in scope cannot access the request" do
-    @controller = nil
-    @config.asset_host = Proc.new do |asset, request|
-      fail "This should not have been called."
-    end
-    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
-    assert_dom_equal '<img alt="Xml" src="/assets/xml.png" />', image_tag("xml.png")
-  end
-
-  test "image_path" do
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      image_path("logo.png")
-
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      path_to_image("logo.png")
-  end
-
-  test "font_path" do
-    assert_match %r{/assets/font-[0-9a-f]+.ttf},
-      font_path("font.ttf")
-
-    assert_match %r{/assets/font-[0-9a-f]+.ttf},
-      path_to_font("font.ttf")
-  end
-
-  test "javascript_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      javascript_path("application")
-
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      javascript_path("application.js")
-
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      path_to_javascript("application.js")
-  end
-
-  test "stylesheet_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.css},
-      stylesheet_path("application")
-
-    assert_match %r{/assets/application-[0-9a-f]+.css},
-      stylesheet_path("application.css")
-
-    assert_match %r{/assets/application-[0-9a-f]+.css},
-      path_to_stylesheet("application.css")
-  end
-
-  test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
-    @controller = nil
-    @config.asset_host = "assets-%d.example.com"
-    @config.default_asset_host_protocol = :request
-    @config.perform_caching = true
-
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "asset path with relative url root" do
-    @controller.config.relative_url_root = "/collaboration/hieraki"
-    assert_equal "/collaboration/hieraki/images/logo.gif",
-     asset_path("/images/logo.gif")
-  end
-
-  test "asset path with relative url root when controller isn't present but relative_url_root is" do
-    @controller = nil
-    @config.relative_url_root = "/collaboration/hieraki"
-    assert_equal "/collaboration/hieraki/images/logo.gif",
-     asset_path("/images/logo.gif")
-  end
-
-  test "font path through asset_path" do
-    assert_match %r{/assets/font-[0-9a-f]+.ttf},
-      asset_path('font.ttf')
-
-    assert_match %r{/assets/dir/font-[0-9a-f]+.ttf},
-      asset_path("dir/font.ttf")
-
-    assert_equal "http://www.example.com/fonts/font.ttf",
-      asset_path("http://www.example.com/fonts/font.ttf")
-  end
-
-  test "javascript path through asset_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      asset_path(:application, :ext => "js")
-
-    assert_match %r{/assets/xmlhr-[0-9a-f]+.js},
-      asset_path("xmlhr", :ext => "js")
-    assert_match %r{/assets/dir/xmlhr-[0-9a-f]+.js},
-      asset_path("dir/xmlhr.js", :ext => "js")
-
-    assert_equal "/dir/xmlhr.js",
-      asset_path("/dir/xmlhr", :ext => "js")
-
-    assert_equal "http://www.example.com/js/xmlhr",
-      asset_path("http://www.example.com/js/xmlhr", :ext => "js")
-    assert_equal "http://www.example.com/js/xmlhr.js",
-      asset_path("http://www.example.com/js/xmlhr.js", :ext => "js")
-  end
-
-  test "javascript include tag" do
-    assert_match %r{<script src="/assets/application-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag(:application)
-    assert_match %r{<script src="/assets/application-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag(:application, :digest => true)
-    assert_match %r{<script src="/assets/application.js" type="text/javascript"></script>},
-      javascript_include_tag(:application, :digest => false)
-
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag("xmlhr")
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag("xmlhr.js")
-    assert_equal '<script src="http://www.example.com/xmlhr" type="text/javascript"></script>',
-      javascript_include_tag("http://www.example.com/xmlhr")
-
-    assert_match %r{<script src=\"/assets/xmlhr-[0-9a-f]+.js" type=\"text/javascript\"></script>\n<script src=\"/assets/extra-[0-9a-f]+.js" type=\"text/javascript\"></script>},
-      javascript_include_tag("xmlhr", "extra")
-
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
-      javascript_include_tag(:application, :debug => true)
-
-    assert_match %r{<script src="/assets/jquery.plugin.js" type="text/javascript"></script>},
-      javascript_include_tag('jquery.plugin', :digest => false)
-
-    @config.assets.compile = true
-    @config.assets.debug = true
-    assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>},
-      javascript_include_tag('/javascripts/application')
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
-      javascript_include_tag(:application)
-  end
-
-  test "stylesheet path through asset_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.css}, asset_path(:application, :ext => "css")
-
-    assert_match %r{/assets/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-    assert_match %r{/assets/dir/style-[0-9a-f]+.css}, asset_path("dir/style.css", :ext => "css")
-    assert_equal "/dir/style.css", asset_path("/dir/style.css", :ext => "css")
-
-    assert_equal "http://www.example.com/css/style",
-      asset_path("http://www.example.com/css/style", :ext => "css")
-    assert_equal "http://www.example.com/css/style.css",
-      asset_path("http://www.example.com/css/style.css", :ext => "css")
-  end
-
-  test "stylesheet link tag" do
-    assert_match %r{<link href="/assets/application-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application)
-    assert_match %r{<link href="/assets/application-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :digest => true)
-    assert_match %r{<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :digest => false)
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style")
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style.css")
-
-    assert_equal '<link href="http://www.example.com/style.css" media="screen" rel="stylesheet" type="text/css" />',
-      stylesheet_link_tag("http://www.example.com/style.css")
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="all" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style", :media => "all")
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="print" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style", :media => "print")
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/extra-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style", "extra")
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :debug => true)
-
-    @config.assets.compile = true
-    @config.assets.debug = true
-    assert_match %r{<link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag('/stylesheets/application')
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application)
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="print" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="print" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :media => "print")
-  end
-
-  test "alternate asset prefix" do
-    stubs(:asset_prefix).returns("/themes/test")
-    assert_match %r{/themes/test/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-  end
-
-  test "alternate asset environment" do
-    assets = Sprockets::Environment.new
-    assets.append_path(FIXTURES.join("sprockets/alternate/stylesheets"))
-    stubs(:asset_environment).returns(assets)
-    assert_match %r{/assets/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-  end
-
-  test "alternate hash based on environment" do
-    assets = Sprockets::Environment.new
-    assets.version = 'development'
-    assets.append_path(FIXTURES.join("sprockets/alternate/stylesheets"))
-    stubs(:asset_environment).returns(assets)
-    dev_path = asset_path("style", :ext => "css")
-
-    assets.version = 'production'
-    prod_path = asset_path("style", :ext => "css")
-
-    assert_not_equal prod_path, dev_path
-  end
-
-  test "precedence of `config.digest = false` over manifest.yml asset digests" do
-    Rails.application.config.assets.digests = {'logo.png' => 'logo-d1g3st.png'}
-    @config.assets.digest = false
-
-    assert_equal '/assets/logo.png',
-      asset_path("logo.png")
-  end
-end
diff --git a/actionpack/test/template/sprockets_helper_with_routes_test.rb b/actionpack/test/template/sprockets_helper_with_routes_test.rb
deleted file mode 100644
index 89b9940eb7..0000000000
--- a/actionpack/test/template/sprockets_helper_with_routes_test.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'abstract_unit'
-require 'sprockets'
-require 'sprockets/helpers/rails_helper'
-require 'mocha'
-
-class SprocketsHelperWithRoutesTest < ActionView::TestCase
-  include Sprockets::Helpers::RailsHelper
-
-  # Let's bring in some named routes to test namespace conflicts with potential *_paths.
-  # We have to do this after we bring in the Sprockets RailsHelper so if there are conflicts,
-  # they'll fail in the way we expect in a real live Rails app.
-  routes = ActionDispatch::Routing::RouteSet.new
-  routes.draw do
-    resources :assets
-  end
-  include routes.url_helpers
-
-  def setup
-    super
-    @controller = BasicController.new
-
-    @assets = Sprockets::Environment.new
-    @assets.append_path(FIXTURES.join("sprockets/app/javascripts"))
-    @assets.append_path(FIXTURES.join("sprockets/app/stylesheets"))
-    @assets.append_path(FIXTURES.join("sprockets/app/images"))
-
-    application = Struct.new(:config, :assets).new(config, @assets)
-    Rails.stubs(:application).returns(application)
-    @config = config
-    @config.perform_caching = true
-    @config.assets.digest = true
-    @config.assets.compile = true
-  end
-
-  test "namespace conflicts on a named route called asset_path" do
-    # Testing this for sanity - asset_path is now a named route!
-    assert_equal asset_path('test_asset'), '/assets/test_asset'
-
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      path_to_asset("logo.png")
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      path_to_asset("logo.png", :digest => true)
-    assert_match %r{/assets/logo.png},
-      path_to_asset("logo.png", :digest => false)
-  end
-
-  test "javascript_include_tag with a named_route named asset_path" do
-    assert_match %r{<script src="/assets/application-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag(:application)
-  end
-
-  test "stylesheet_link_tag with a named_route named asset_path" do
-    assert_match %r{<link href="/assets/application-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application)
-  end
-
-end
\ No newline at end of file
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 37858c1ba2..f2ed2ec609 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -277,6 +277,12 @@ module ActionView
   end
 
   class RenderTemplateTest < ActionView::TestCase
+    test "supports specifying templates with a Regexp" do
+      controller.controller_path = "fun"
+      render(:template => "fun/games/hello_world")
+      assert_template %r{\Afun/games/hello_world\Z}
+    end
+
     test "supports specifying partials" do
       controller.controller_path = "test"
       render(:template => "test/calling_partial_with_layout")