1 files changed, 15 insertions, 30 deletions
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index abc98ebe69..0bfdbeebd1 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -4,18 +4,6 @@ require 'controller/fake_models'
 class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
 
-  class Developer
-    def name_before_type_cast
-      "David"
-    end
-
-    def name
-      "Santiago"
-    end
-
-    attr_writer :language
-  end
-
   def form_for(*)
     @output_buffer = super
   end
@@ -278,24 +266,6 @@ class FormHelperTest < ActionView::TestCase
       text_field("user", "email", :type => "email")
   end
 
-  def test_text_field_from_a_user_defined_method
-    @developer = Developer.new
-    assert_dom_equal(
-      '<input id="developer_name" name="developer[name]" size="30" type="text" value="Santiago" />', text_field("developer", "name")
-    )
-  end
-
-  def test_text_field_on_a_model_with_undefined_attr_reader
-    @developer = Developer.new
-    @developer.language = 'ruby'
-    begin
-      text_field("developer", "language")
-    rescue NoMethodError => error
-      message = error.message
-    end
-    assert_equal "Model #{Developer} does not respond to language", message
-  end
-
   def test_check_box
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
@@ -761,6 +731,20 @@ class FormHelperTest < ActionView::TestCase
 
     assert_dom_equal expected, output_buffer
   end
+  
+  def test_form_for_with_search_field
+    # Test case for bug which would emit an "object" attribute
+    # when used with form_for using a search_field form helper
+    form_for(Post.new, :url => "/search", :html => { :id => 'search-post' }) do |f|
+      concat f.search_field(:title)
+    end
+
+    expected =  whole_form("/search", "search-post", "new_post") do
+      "<input name='post[title]' size='30' type='search' id='post_title' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
 
   def test_form_for_with_remote
     form_for(@post, :url => '/', :remote => true, :html => { :id => 'create-post', :method => :put }) do |f|
@@ -1737,4 +1721,5 @@ class FormHelperTest < ActionView::TestCase
     def protect_against_forgery?
       false
     end
+
 end