3 files changed, 30 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 618e7b77b2..2364bbf3a3 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -194,6 +194,7 @@ class ActionCachingTestController < CachingController
   caches_action :show, :cache_path => 'http://test.host/custom/show'
   caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
   caches_action :with_layout
+  caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } } 
   caches_action :layout_false, :layout => false
   caches_action :record_not_found, :four_oh_four, :simple_runtime_error
 
@@ -219,6 +220,11 @@ class ActionCachingTestController < CachingController
     render :text => @cache_this, :layout => true
   end
 
+  def with_format_and_http_param
+    @cache_this = MockTime.now.to_f.to_s
+    render :text => @cache_this
+  end
+  
   def record_not_found
     raise ActiveRecord::RecordNotFound, "oops!"
   end
@@ -359,6 +365,13 @@ class ActionCacheTest < ActionController::TestCase
     assert !fragment_exist?('hostname.com/action_caching_test')
   end
 
+  def test_action_cache_with_format_and_http_param
+    get :with_format_and_http_param, :format => 'json'
+    assert_response :success
+    assert !fragment_exist?('hostname.com/action_caching_test/with_format_and_http_param.json?key=value.json')
+    assert fragment_exist?('hostname.com/action_caching_test/with_format_and_http_param.json?key=value')
+  end
+
   def test_action_cache_with_store_options
     MockTime.expects(:now).returns(12345).once
     @controller.expects(:read_fragment).with('hostname.com/action_caching_test', :expires_in => 1.hour).once
diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb
index 3ca29f1bcf..c424dcbd8d 100644
--- a/actionpack/test/controller/new_base/bare_metal_test.rb
+++ b/actionpack/test/controller/new_base/bare_metal_test.rb
@@ -23,6 +23,12 @@ module BareMetalTest
 
       assert_equal "Hello world", string
     end
+
+    test "response_body value is wrapped in an array when the value is a String" do
+      controller = BareController.new
+      controller.index
+      assert_equal ["Hello world"], controller.response_body
+    end
   end
 
   class HeadController < ActionController::Metal
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 11ced2df2a..dc07e07cb9 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -16,6 +16,10 @@ module AbstractController
         W.default_url_options[:host] = 'www.basecamphq.com'
       end
 
+      def add_numeric_host!
+        W.default_url_options[:host] = '127.0.0.1'
+      end
+
       def test_exception_is_thrown_without_host
         assert_raise ArgumentError do
           W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
@@ -81,6 +85,13 @@ module AbstractController
         )
       end
 
+      def test_subdomain_may_be_accepted_with_numeric_host
+        add_numeric_host!
+        assert_equal('http://127.0.0.1/c/a/i',
+          W.new.url_for(:subdomain => 'api', :controller => 'c', :action => 'a', :id => 'i')
+        )
+      end
+
       def test_domain_may_be_changed
         add_host!
         assert_equal('http://www.37signals.com/c/a/i',