diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
| commit | 8260f0b40f8954f1822a0f856f7c0706afbba0bd (patch) | |
| tree | 1ec6fe65274eeb87c2030ba2daa3e230a375e846 /actionpack/test/template/form_helper_test.rb | |
| parent | 6241d4e5535190b817e546130cfe179b641da1ba (diff) | |
| parent | 6d6e6105c074eb9f266619e77a0873635af94124 (diff) | |
| download | rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.gz rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.bz2 rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'actionpack/test/template/form_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/form_helper_test.rb | 6 |
1 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 aafc318b76..f2d524bd1b 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -1195,8 +1195,8 @@ class FormHelperTest < ActionView::TestCase end def test_default_form_builder - old_default_form_builder, ActionView.default_form_builder = - ActionView.default_form_builder, LabelledFormBuilder + old_default_form_builder, ActionView::Base.default_form_builder = + ActionView::Base.default_form_builder, LabelledFormBuilder form_for(:post, @post) do |f| concat f.text_field(:title) @@ -1213,7 +1213,7 @@ class FormHelperTest < ActionView::TestCase assert_dom_equal expected, output_buffer ensure - ActionView.default_form_builder = old_default_form_builder + ActionView::Base.default_form_builder = old_default_form_builder end def test_default_form_builder_with_active_record_helpers |