3 files changed, 58 insertions, 3 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 563caee8a2..94f519e330 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
@@ -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..9e06621c83 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!")
@@ -337,6 +354,13 @@ class AtomFeedTest < ActionController::TestCase
     end
   end
 
+  def test_feed_entry_url_false_option_adds_no_link
+    with_restful_routing(:scrolls) do
+      get :index, :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/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