aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-04-29 09:42:53 -0700
committerJosé Valim <jose.valim@gmail.com>2012-04-29 09:42:53 -0700
commit0df261a4d1557ef0c38d44fb7aa096c203ffaac5 (patch)
treecb4f2a03d6b775181a9d4cd55450495a10470363 /actionpack
parentd6bbd337ef1b96ed246bccaaf6e8b15a7077b9aa (diff)
parentb18603b8902378662db33bdc3cca7550fcd8c4d4 (diff)
downloadrails-0df261a4d1557ef0c38d44fb7aa096c203ffaac5.tar.gz
rails-0df261a4d1557ef0c38d44fb7aa096c203ffaac5.tar.bz2
rails-0df261a4d1557ef0c38d44fb7aa096c203ffaac5.zip
Merge pull request #6051 from rafaelfranca/fix_build
Fix the build
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/template/form_helper_test.rb4
-rw-r--r--actionpack/test/template/record_tag_helper_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 3f459bad2e..19af01e2c8 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -2041,8 +2041,8 @@ class FormHelperTest < ActionView::TestCase
concat f.text_field(:title)
end
- expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
- "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>"
+ expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+ "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>"
end
assert_dom_equal expected, output_buffer
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index b4db6d9a71..f33471ab28 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -103,7 +103,7 @@ class RecordTagHelperTest < ActionView::TestCase
def test_content_tag_for_does_not_change_options_hash
options = { :class => "important" }
- result = content_tag_for(:li, @post, options) { }
+ content_tag_for(:li, @post, options) { }
assert_equal({ :class => "important" }, options)
end
end