Merge branch 'master' of github.com:rails/rails

6 files changed, 55 insertions, 12 deletions

diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index cb3e848dfa..4ef6fa4000 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 #--
 # Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
 # Under MIT and/or CC By license.
@@ -347,7 +348,6 @@ class AssertSelectTest < ActionController::TestCase
       assert_select str, :text => "\343\203\201\343\202\261\343\203\203\343\203\210"
       assert_select str, "\343\203\201\343\202\261\343\203\203\343\203\210"
       if str.respond_to?(:force_encoding)
-        str.force_encoding(Encoding::UTF_8)
         assert_select str, /\343\203\201..\343\203\210/u
         assert_raise(Assertion) { assert_select str, /\343\203\201.\343\203\210/u }
       else
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index e1c1128753..48be7571ea 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'rbconfig'
 
 # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
 # method has access to the view_paths array when looking for a layout to automatically assign.
@@ -209,7 +210,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
   end
 end
 
-unless RUBY_PLATFORM =~ /mswin|mingw/
+unless Config::CONFIG['host_os'] =~ /mswin|mingw/
   class LayoutSymlinkedTest < LayoutTest
     layout "symlinked/symlinked_layout"
   end
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index 2580ada88b..5958b18d80 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -3,6 +3,14 @@ require 'controller/fake_models'
 require 'pathname'
 
 class RenderJsonTest < ActionController::TestCase
+  class JsonRenderable
+    def as_json(options={})
+      hash = { :a => :b, :c => :d, :e => :f }
+      hash.except!(*options[:except]) if options[:except]
+      hash
+    end
+  end
+
   class TestController < ActionController::Base
     protect_from_forgery
 
@@ -37,6 +45,10 @@ class RenderJsonTest < ActionController::TestCase
     def render_json_with_render_to_string
       render :json => {:hello => render_to_string(:partial => 'partial')}
     end
+
+    def render_json_with_extra_options
+      render :json => JsonRenderable.new, :except => [:c, :e]
+    end
   end
 
   tests TestController
@@ -91,4 +103,10 @@ class RenderJsonTest < ActionController::TestCase
     assert_equal '{"hello":"partial html"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
+
+  def test_render_json_forwards_extra_options
+    get :render_json_with_extra_options
+    assert_equal '{"a":"b"}', @response.body
+    assert_equal 'application/json', @response.content_type
+  end
 end
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 4da6c954cf..4bf867fa41 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -3,6 +3,13 @@ require 'controller/fake_models'
 require 'pathname'
 
 class RenderXmlTest < ActionController::TestCase
+  class XmlRenderable
+    def to_xml(options)
+      options[:root] ||= "i-am-xml"
+      "<#{options[:root]}/>"
+    end
+  end
+
   class TestController < ActionController::Base
     protect_from_forgery
 
@@ -20,13 +27,7 @@ class RenderXmlTest < ActionController::TestCase
     end
 
     def render_with_to_xml
-      to_xmlable = Class.new do
-        def to_xml
-          "<i-am-xml/>"
-        end
-      end.new
-
-      render :xml => to_xmlable
+      render :xml => XmlRenderable.new
     end
 
     def formatted_xml_erb
@@ -35,6 +36,10 @@ class RenderXmlTest < ActionController::TestCase
     def render_xml_with_custom_content_type
       render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
     end
+
+    def render_xml_with_custom_options
+      render :xml => XmlRenderable.new, :root => "i-am-THE-xml"
+    end
   end
 
   tests TestController
@@ -58,6 +63,11 @@ class RenderXmlTest < ActionController::TestCase
     assert_equal "<i-am-xml/>", @response.body
   end
 
+  def test_rendering_xml_should_call_to_xml_with_extra_options
+    get :render_xml_with_custom_options
+    assert_equal "<i-am-THE-xml/>", @response.body
+  end
+
   def test_rendering_with_object_location_should_set_header_with_url_for
     with_routing do |set|
       set.draw do |map|
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 30c9a65b7c..36b8055810 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -25,7 +25,7 @@ class SendFileController < ActionController::Base
   end
 
   def multibyte_text_data
-    send_data("Кирилица\n祝您好運", options)
+    send_data("Кирилица\n祝您好運.", options)
   end
 end
 
@@ -128,7 +128,7 @@ class SendFileTest < ActionController::TestCase
 
     assert_equal 'image/png', @controller.content_type
   end
-  
+
 
   def test_send_file_headers_with_bad_symbol
     options = {
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index fc7773dffe..907acf9573 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -257,10 +257,24 @@ module AbstractController
         assert_equal second_class.default_url_options[:host], second_host
       end
 
+      def test_with_stringified_keys
+        assert_equal("/c", W.new.url_for('controller' => 'c', 'only_path' => true))
+        assert_equal("/c/a", W.new.url_for('controller' => 'c', 'action' => 'a', 'only_path' => true))
+      end
+
+      def test_with_hash_with_indifferent_access
+        W.default_url_options[:controller] = 'd'
+        W.default_url_options[:only_path]  = false
+        assert_equal("/c", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'only_path' => true)))
+
+        W.default_url_options[:action] = 'b'
+        assert_equal("/c/a", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true)))
+      end
+
       private
         def extract_params(url)
           url.split('?', 2).last.split('&').sort
         end
     end
   end
-end
\ No newline at end of file
+end