Get render :inline working

actionpack/lib/action_controller/new_base/layouts.rb

@@ -13,7 +13,7 @@ def render_to_body(options)
       # render :text => ..., :layout => ...
       # or
       # render :anything_else
-      if !options.key?(:text) || options.key?(:layout)
+      if (!options.key?(:text) && !options.key?(:inline)) || options.key?(:layout)
         options[:_layout] = options.key?(:layout) ? _layout_for_option(options[:layout]) : _default_layout
       end
       

actionpack/lib/action_controller/new_base/renderer.rb

@@ -17,6 +17,10 @@ def render_to_body(options)
       if options.key?(:text)
         options[:_template] = ActionView::TextTemplate.new(_text(options))
         template = nil
+      elsif options.key?(:inline)
+        handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
+        template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
+        options[:_template] = template
       elsif options.key?(:template)
         options[:_template_name] = options[:template]
       elsif options.key?(:action)

actionpack/lib/action_controller/testing/process2.rb

@@ -49,7 +49,7 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method =
       @request.session = ActionController::TestSession.new(session) unless session.nil?
       @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
       build_request_uri(action, parameters)
-
+      @controller.params.merge!(parameters)
       # Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
       @controller.process_with_test(@request, @response)
     end