mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Remove deprecated form_for with strings or symbols
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
This commit is contained in:
committed by
Santiago Pastorino
parent
c52e2cf4b3
commit
be797750e6
@@ -303,15 +303,9 @@ module ActionView
|
||||
|
||||
options[:html] ||= {}
|
||||
|
||||
case record
|
||||
when String, Symbol
|
||||
object_name = record
|
||||
object = nil
|
||||
else
|
||||
object = record.is_a?(Array) ? record.last : record
|
||||
object_name = options[:as] || ActiveModel::Naming.param_key(object)
|
||||
apply_form_for_options!(record, options)
|
||||
end
|
||||
object = record.is_a?(Array) ? record.last : record
|
||||
object_name = options[:as] || ActiveModel::Naming.param_key(object)
|
||||
apply_form_for_options!(record, options)
|
||||
|
||||
options[:html][:remote] = options.delete(:remote)
|
||||
builder = options[:parent_builder] = instantiate_builder(object_name, object, options, &proc)
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
require "abstract_unit"
|
||||
require "template/erb/helper"
|
||||
require "controller/fake_models"
|
||||
|
||||
module ERBTest
|
||||
class TagHelperTest < BlockTestCase
|
||||
test "form_for works" do
|
||||
output = render_content "form_for(:staticpage, :url => {:controller => 'blah', :action => 'update'})", ""
|
||||
output = render_content "form_for(Post.new, :url => {:controller => 'blah', :action => 'update'})", ""
|
||||
assert_match %r{<form.*action="/blah/update".*method="post">.*</form>}, output
|
||||
end
|
||||
end
|
||||
|
||||
@@ -4,6 +4,8 @@ module ERBTest
|
||||
include ActionView::Helpers::TagHelper
|
||||
include ActionView::Helpers::JavaScriptHelper
|
||||
include ActionView::Helpers::FormHelper
|
||||
include ActionView::Context
|
||||
include ActionController::RecordIdentifier
|
||||
|
||||
attr_accessor :output_buffer, :controller
|
||||
|
||||
@@ -20,4 +22,4 @@ module ERBTest
|
||||
"<%= #{str} do %>#{rest}<% end %>"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -781,23 +781,6 @@ class FormHelperTest < ActionView::TestCase
|
||||
assert_dom_equal expected, output_buffer
|
||||
end
|
||||
|
||||
def test_form_for_without_object
|
||||
form_for(:post, :html => { :id => 'create-post' }) do |f|
|
||||
concat f.text_field(:title)
|
||||
concat f.text_area(:body)
|
||||
concat f.check_box(:secret)
|
||||
end
|
||||
|
||||
expected = whole_form("/", "create-post") do
|
||||
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
|
||||
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
|
||||
"<input name='post[secret]' type='hidden' value='0' />" +
|
||||
"<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
|
||||
end
|
||||
|
||||
assert_dom_equal expected, output_buffer
|
||||
end
|
||||
|
||||
def test_form_for_with_index
|
||||
form_for(@post, :as => "post[]") do |f|
|
||||
concat f.label(:title)
|
||||
@@ -867,22 +850,6 @@ class FormHelperTest < ActionView::TestCase
|
||||
I18n.locale = old_locale
|
||||
end
|
||||
|
||||
def test_submit_without_object_and_locale_strings
|
||||
old_locale, I18n.locale = I18n.locale, :submit
|
||||
|
||||
form_for(:post) do |f|
|
||||
concat f.submit :class => "extra"
|
||||
end
|
||||
|
||||
expected = whole_form do
|
||||
"<input name='commit' class='extra' id='post_submit' type='submit' value='Save changes' />"
|
||||
end
|
||||
|
||||
assert_dom_equal expected, output_buffer
|
||||
ensure
|
||||
I18n.locale = old_locale
|
||||
end
|
||||
|
||||
def test_submit_with_object_and_nested_lookup
|
||||
old_locale, I18n.locale = I18n.locale, :submit
|
||||
|
||||
|
||||
Reference in New Issue
Block a user