Merge branch 'master' into pr/18316

Conflicts: activerecord/CHANGELOG.md
author: Mingdong Luo <mdluo@nsmss.com> 2015-01-31 19:23:48 -0800
committer: Mingdong Luo <mdluo@nsmss.com> 2015-01-31 19:23:48 -0800
commit: 549d171a90135999e3c670f489494b7a39dd6dd7 (patch)
tree: 233466527b797fe3ea7c6a7a3673795cea28aebe /actionview/test
parent: c840b18ac31a852d99ff760229f2c087b6961727 (diff)
parent: 70ac072976c8cc6f013f0df3777e54ccae3f4f8c (diff)
download: rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.gz
rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.bz2
rails-549d171a90135999e3c670f489494b7a39dd6dd7.zip
8 files changed, 112 insertions, 50 deletions
diff --git a/actionview/test/actionpack/abstract/abstract_controller_test.rb b/actionview/test/actionpack/abstract/abstract_controller_test.rb
index e653b12d32..490932fef0 100644
--- a/actionview/test/actionpack/abstract/abstract_controller_test.rb
+++ b/actionview/test/actionpack/abstract/abstract_controller_test.rb
@@ -168,7 +168,7 @@ module AbstractController
       end
     end
 
-    class OverridingLocalPrefixesTest < ActiveSupport::TestCase # TODO: remove me in 5.0/4.3.
+    class OverridingLocalPrefixesTest < ActiveSupport::TestCase
       test "overriding .local_prefixes adds prefix" do
         @controller = OverridingLocalPrefixes.new
         @controller.process(:index)
@@ -182,22 +182,6 @@ module AbstractController
       end
     end
 
-    class DeprecatedParentPrefixes < OverridingLocalPrefixes
-      def self.parent_prefixes
-        ["abstract_controller/testing/me3"]
-      end
-    end
-
-    class DeprecatedParentPrefixesTest < ActiveSupport::TestCase # TODO: remove me in 5.0/4.3.
-      test "overriding .parent_prefixes is deprecated" do
-        @controller = DeprecatedParentPrefixes.new
-        assert_deprecated do
-          @controller.process(:index)
-        end
-        assert_equal "Hello from me3/index.erb", @controller.response_body
-      end
-    end
-
     # Test rendering with layouts
     # ====
     # self._layout is used when defined
diff --git a/actionview/test/actionpack/controller/layout_test.rb b/actionview/test/actionpack/controller/layout_test.rb
index bd345fe873..7b8a83e2fe 100644
--- a/actionview/test/actionpack/controller/layout_test.rb
+++ b/actionview/test/actionpack/controller/layout_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'rbconfig'
 require 'active_support/core_ext/array/extract_options'
 
 # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 563caee8a2..0a8842b527 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -453,6 +453,10 @@ class TestController < ApplicationController
     render :text => "foo"
   end
 
+  def render_with_assigns_option
+    render inline: '<%= @hello %>', assigns: { hello: "world" }
+  end
+
   def yield_content_for
     render :action => "content_for", :layout => "yield"
   end
@@ -953,12 +957,12 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_accessing_params_in_template
-    get :accessing_params_in_template, :name => "David"
+    get :accessing_params_in_template, params: { name: "David" }
     assert_equal "Hello: David", @response.body
   end
 
   def test_accessing_local_assigns_in_inline_template
-    get :accessing_local_assigns_in_inline_template, :local_name => "Local David"
+    get :accessing_local_assigns_in_inline_template, params: { local_name: "Local David" }
     assert_equal "Goodbye, Local David", @response.body
     assert_equal "text/html", @response.content_type
   end
@@ -1042,7 +1046,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_accessing_params_in_template_with_layout
-    get :accessing_params_in_template_with_layout, :name => "David"
+    get :accessing_params_in_template_with_layout, params: { name: "David" }
     assert_equal "<html>Hello: David</html>", @response.body
   end
 
@@ -1102,6 +1106,11 @@ class RenderTest < ActionController::TestCase
     assert_equal "world", assigns["hello"]
   end
 
+  def test_render_text_with_assigns_option
+    get :render_with_assigns_option
+    assert_equal 'world', response.body
+  end
+
   # :ported:
   def test_template_with_locals
     get :render_with_explicit_template_with_locals
diff --git a/actionview/test/template/atom_feed_helper_test.rb b/actionview/test/template/atom_feed_helper_test.rb
index 68b44c4f0d..525d99750d 100644
--- a/actionview/test/template/atom_feed_helper_test.rb
+++ b/actionview/test/template/atom_feed_helper_test.rb
@@ -62,6 +62,23 @@ class ScrollsController < ActionController::Base
           end
         end
     EOT
+    FEEDS["entry_url_false_option"] = <<-EOT
+        atom_feed do |feed|
+          feed.title("My great blog!")
+          feed.updated((@scrolls.first.created_at))
+
+          @scrolls.each do |scroll|
+            feed.entry(scroll, :url => false) do |entry|
+              entry.title(scroll.title)
+              entry.content(scroll.body, :type => 'html')
+
+              entry.author do |author|
+                author.name("DHH")
+              end
+            end
+          end
+        end
+    EOT
     FEEDS["xml_block"] = <<-EOT
         atom_feed do |feed|
           feed.title("My great blog!")
@@ -214,28 +231,28 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_should_use_default_language_if_none_is_given
     with_restful_routing(:scrolls) do
-      get :index, :id => "defaults"
+      get :index, params: { id: "defaults" }
       assert_match(%r{xml:lang="en-US"}, @response.body)
     end
   end
 
   def test_feed_should_include_two_entries
     with_restful_routing(:scrolls) do
-      get :index, :id => "defaults"
+      get :index, params: { id: "defaults" }
       assert_select "entry", 2
     end
   end
 
   def test_entry_should_only_use_published_if_created_at_is_present
     with_restful_routing(:scrolls) do
-      get :index, :id => "defaults"
+      get :index, params: { id: "defaults" }
       assert_select "published", 1
     end
   end
 
   def test_providing_builder_to_atom_feed
     with_restful_routing(:scrolls) do
-      get :index, :id=>"provide_builder"
+      get :index, params: { id: "provide_builder" }
       # because we pass in the non-default builder, the content generated by the
       # helper should go 'nowhere'.  Leaving the response body blank.
       assert @response.body.blank?
@@ -244,7 +261,7 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_entry_with_prefilled_options_should_use_those_instead_of_querying_the_record
     with_restful_routing(:scrolls) do
-      get :index, :id => "entry_options"
+      get :index, params: { id: "entry_options" }
 
       assert_select "updated", Time.utc(2007, 1, 1).xmlschema
       assert_select "updated", Time.utc(2007, 1, 2).xmlschema
@@ -253,21 +270,21 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_self_url_should_default_to_current_request_url
     with_restful_routing(:scrolls) do
-      get :index, :id => "defaults"
+      get :index, params: { id: "defaults" }
       assert_select "link[rel=self][href=\"http://www.nextangle.com/scrolls?id=defaults\"]"
     end
   end
 
   def test_feed_id_should_be_a_valid_tag
     with_restful_routing(:scrolls) do
-      get :index, :id => "defaults"
+      get :index, params: { id: "defaults" }
       assert_select "id", :text => "tag:www.nextangle.com,2008:/scrolls?id=defaults"
     end
   end
 
   def test_entry_id_should_be_a_valid_tag
     with_restful_routing(:scrolls) do
-      get :index, :id => "defaults"
+      get :index, params: { id: "defaults" }
       assert_select "entry id", :text => "tag:www.nextangle.com,2008:Scroll/1"
       assert_select "entry id", :text => "tag:www.nextangle.com,2008:Scroll/2"
     end
@@ -275,14 +292,14 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_should_allow_nested_xml_blocks
     with_restful_routing(:scrolls) do
-      get :index, :id => "xml_block"
+      get :index, params: { id: "xml_block" }
       assert_select "author name", :text => "DHH"
     end
   end
 
   def test_feed_should_include_atomPub_namespace
     with_restful_routing(:scrolls) do
-      get :index, :id => "feed_with_atomPub_namespace"
+      get :index, params: { id: "feed_with_atomPub_namespace" }
       assert_match %r{xml:lang="en-US"}, @response.body
       assert_match %r{xmlns="http://www.w3.org/2005/Atom"}, @response.body
       assert_match %r{xmlns:app="http://www.w3.org/2007/app"}, @response.body
@@ -291,7 +308,7 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_should_allow_overriding_ids
     with_restful_routing(:scrolls) do
-      get :index, :id => "feed_with_overridden_ids"
+      get :index, params: { id: "feed_with_overridden_ids" }
       assert_select "id", :text => "tag:test.rubyonrails.org,2008:test/"
       assert_select "entry id", :text => "tag:test.rubyonrails.org,2008:1"
       assert_select "entry id", :text => "tag:test.rubyonrails.org,2008:2"
@@ -300,7 +317,7 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_xml_processing_instructions
     with_restful_routing(:scrolls) do
-      get :index, :id => 'feed_with_xml_processing_instructions'
+      get :index, params: { id: 'feed_with_xml_processing_instructions' }
       assert_match %r{<\?xml-stylesheet [^\?]*type="text/css"}, @response.body
       assert_match %r{<\?xml-stylesheet [^\?]*href="t.css"}, @response.body
     end
@@ -308,7 +325,7 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_xml_processing_instructions_duplicate_targets
     with_restful_routing(:scrolls) do
-      get :index, :id => 'feed_with_xml_processing_instructions_duplicate_targets'
+      get :index, params: { id: 'feed_with_xml_processing_instructions_duplicate_targets' }
       assert_match %r{<\?target1 (a="1" b="2"|b="2" a="1")\?>}, @response.body
       assert_match %r{<\?target1 (c="3" d="4"|d="4" c="3")\?>}, @response.body
     end
@@ -316,7 +333,7 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_xhtml
     with_restful_routing(:scrolls) do
-      get :index, :id => "feed_with_xhtml_content"
+      get :index, params: { id:  "feed_with_xhtml_content" }
       assert_match %r{xmlns="http://www.w3.org/1999/xhtml"}, @response.body
       assert_select "summary", :text => /Something Boring/
       assert_select "summary", :text => /after 2/
@@ -325,18 +342,25 @@ class AtomFeedTest < ActionController::TestCase
 
   def test_feed_entry_type_option_default_to_text_html
     with_restful_routing(:scrolls) do
-      get :index, :id => 'defaults'
+      get :index, params: { id: 'defaults' }
       assert_select "entry link[rel=alternate][type=\"text/html\"]"
     end
   end
 
   def test_feed_entry_type_option_specified
     with_restful_routing(:scrolls) do
-      get :index, :id => 'entry_type_options'
+      get :index, params: { id: 'entry_type_options' }
       assert_select "entry link[rel=alternate][type=\"text/xml\"]"
     end
   end
 
+  def test_feed_entry_url_false_option_adds_no_link
+    with_restful_routing(:scrolls) do
+      get :index, params: { id: 'entry_url_false_option' }
+      assert_select "entry link", false
+    end
+  end
+
   private
     def with_restful_routing(resources)
       with_routing do |set|
diff --git a/actionview/test/template/date_helper_test.rb b/actionview/test/template/date_helper_test.rb
index a6962b5200..bfb073680e 100644
--- a/actionview/test/template/date_helper_test.rb
+++ b/actionview/test/template/date_helper_test.rb
@@ -2330,7 +2330,7 @@ class DateHelperTest < ActionView::TestCase
     # The love zone is UTC+0
     mytz = Class.new(ActiveSupport::TimeZone) {
       attr_accessor :now
-    }.create('tenderlove', 0)
+    }.create('tenderlove', 0, ActiveSupport::TimeZone.find_tzinfo('UTC'))
 
     now       = Time.mktime(2004, 6, 15, 16, 35, 0)
     mytz.now  = now
diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index fff1e1e572..dccf6a2090 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -99,7 +99,9 @@ class FormHelperTest < ActionView::TestCase
       }.new
     end
     def @post.to_key; [123]; end
-    def @post.id_before_type_cast; 123; end
+    def @post.id; 0; end
+    def @post.id_before_type_cast; "omg"; end
+    def @post.id_came_from_user?; true; end
     def @post.to_param; '123'; end
 
     @post.persisted   = true
@@ -900,9 +902,29 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
-  def test_text_area_with_value_before_type_cast
+  def test_inputs_use_before_type_cast_to_retain_information_from_validations_like_numericality
     assert_dom_equal(
-      %{<textarea id="post_id" name="post[id]">\n123</textarea>},
+      %{<textarea id="post_id" name="post[id]">\nomg</textarea>},
+      text_area("post", "id")
+    )
+  end
+
+  def test_inputs_dont_use_before_type_cast_when_value_did_not_come_from_user
+    class << @post
+      undef id_came_from_user?
+      def id_came_from_user?; false; end
+    end
+
+    assert_dom_equal(
+      %{<textarea id="post_id" name="post[id]">\n0</textarea>},
+      text_area("post", "id")
+    )
+  end
+
+  def test_inputs_use_before_typecast_when_object_doesnt_respond_to_came_from_user
+    class << @post; undef id_came_from_user?; end
+    assert_dom_equal(
+      %{<textarea id="post_id" name="post[id]">\nomg</textarea>},
       text_area("post", "id")
     )
   end
diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
index dea861c0e5..8fde478ac9 100644
--- a/actionview/test/template/translation_helper_test.rb
+++ b/actionview/test/template/translation_helper_test.rb
@@ -1,5 +1,13 @@
 require 'abstract_unit'
 
+module I18n
+  class CustomExceptionHandler
+    def self.call(exception, locale, key, options)
+      'from CustomExceptionHandler'
+    end
+  end
+end
+
 class TranslationHelperTest < ActiveSupport::TestCase
   include ActionView::Helpers::TranslationHelper
 
@@ -72,6 +80,22 @@ class TranslationHelperTest < ActiveSupport::TestCase
     end
   end
 
+  def test_uses_custom_exception_handler_when_specified
+    old_exception_handler = I18n.exception_handler
+    I18n.exception_handler = I18n::CustomExceptionHandler
+    assert_equal 'from CustomExceptionHandler', translate(:"translations.missing", raise: false)
+  ensure
+    I18n.exception_handler = old_exception_handler
+  end
+
+  def test_uses_custom_exception_handler_when_specified_for_html
+    old_exception_handler = I18n.exception_handler
+    I18n.exception_handler = I18n::CustomExceptionHandler
+    assert_equal 'from CustomExceptionHandler', translate(:"translations.missing_html", raise: false)
+  ensure
+    I18n.exception_handler = old_exception_handler
+  end
+
   def test_i18n_translate_defaults_to_nil_rescue_format
     expected = 'translation missing: en.translations.missing'
     assert_equal expected, I18n.translate(:"translations.missing")
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index 0d6f31af9b..0ce9d38fa3 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -624,13 +624,13 @@ class UrlHelperControllerTest < ActionController::TestCase
   end
 
   def test_named_route_url_shows_host_and_path
-    get :show_named_route, kind: 'url'
+    get :show_named_route, params: { kind: 'url' }
     assert_equal 'http://test.host/url_helper_controller_test/url_helper/show_named_route',
       @response.body
   end
 
   def test_named_route_path_shows_only_path
-    get :show_named_route, kind: 'path'
+    get :show_named_route, params: { kind: 'path' }
     assert_equal '/url_helper_controller_test/url_helper/show_named_route', @response.body
   end
 
@@ -646,7 +646,7 @@ class UrlHelperControllerTest < ActionController::TestCase
       end
     end
 
-    get :show_named_route, kind: 'url'
+    get :show_named_route, params: { kind: 'url' }
     assert_equal 'http://testtwo.host/url_helper_controller_test/url_helper/show_named_route', @response.body
   end
 
@@ -661,11 +661,11 @@ class UrlHelperControllerTest < ActionController::TestCase
   end
 
   def test_recall_params_should_normalize_id
-    get :show, id: '123'
+    get :show, params: { id: '123' }
     assert_equal 302, @response.status
     assert_equal 'http://test.host/url_helper_controller_test/url_helper/profile/123', @response.location
 
-    get :show, name: '123'
+    get :show, params: { name: '123' }
     assert_equal 'ok', @response.body
   end
 
@@ -704,7 +704,7 @@ class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase
   end
 
   def test_link_to_unless_current_shows_link
-    get :show, id: 1
+    get :show, params: { id: 1 }
     assert_equal %{<a href="/tasks">tasks</a>\n} +
       %{<a href="#{@request.protocol}#{@request.host_with_port}/tasks">tasks</a>},
       @response.body
@@ -778,21 +778,21 @@ class PolymorphicControllerTest < ActionController::TestCase
   def test_existing_resource
     @controller = WorkshopsController.new
 
-    get :show, id: 1
+    get :show, params: { id: 1 }
     assert_equal %{/workshops/1\n<a href="/workshops/1">Workshop</a>}, @response.body
   end
 
   def test_new_nested_resource
     @controller = SessionsController.new
 
-    get :index, workshop_id: 1
+    get :index, params: { workshop_id: 1 }
     assert_equal %{/workshops/1/sessions\n<a href="/workshops/1/sessions">Session</a>}, @response.body
   end
 
   def test_existing_nested_resource
     @controller = SessionsController.new
 
-    get :show, workshop_id: 1, id: 1
+    get :show, params: { workshop_id: 1, id: 1 }
     assert_equal %{/workshops/1/sessions/1\n<a href="/workshops/1/sessions/1">Session</a>}, @response.body
   end
 end
author	Mingdong Luo <mdluo@nsmss.com>	2015-01-31 19:23:48 -0800
committer	Mingdong Luo <mdluo@nsmss.com>	2015-01-31 19:23:48 -0800
commit	549d171a90135999e3c670f489494b7a39dd6dd7 (patch)
tree	233466527b797fe3ea7c6a7a3673795cea28aebe /actionview/test
parent	c840b18ac31a852d99ff760229f2c087b6961727 (diff)
parent	70ac072976c8cc6f013f0df3777e54ccae3f4f8c (diff)
download	rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.gz rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.bz2 rails-549d171a90135999e3c670f489494b7a39dd6dd7.zip