diff options
author | José Valim <jose.valim@gmail.com> | 2011-08-01 11:42:00 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-08-01 11:42:00 +0200 |
commit | dc8773b19f61af2ba818d66923fc65e17bad6c20 (patch) | |
tree | bfc4089cd48db0caeddd550dc56db49b799ee1e0 /actionpack/test/template | |
parent | d701b3fa470b53a56da131cf64b96e411178bc08 (diff) | |
download | rails-dc8773b19f61af2ba818d66923fc65e17bad6c20.tar.gz rails-dc8773b19f61af2ba818d66923fc65e17bad6c20.tar.bz2 rails-dc8773b19f61af2ba818d66923fc65e17bad6c20.zip |
Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.
Diffstat (limited to 'actionpack/test/template')
-rw-r--r-- | actionpack/test/template/form_helper_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/render_test.rb | 4 |
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 71a2c46d92..f898c22e1e 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -1895,7 +1895,7 @@ class FormHelperTest < ActionView::TestCase path = nil form_for(@post, :builder => LabelledFormBuilder) do |f| - path = f.to_path + path = f.to_partial_path '' end diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 0b91e55091..6f02f8662d 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -214,14 +214,14 @@ module RenderTestCases end def test_render_partial_using_object_with_deprecated_partial_path - assert_deprecated(/#model_name.*#partial_path.*#to_path/) do + assert_deprecated(/#model_name.*#partial_path.*#to_partial_path/) do assert_equal "Hello: nertzy", @controller_view.render(CustomerWithDeprecatedPartialPath.new("nertzy"), :greeting => "Hello") end end def test_render_partial_using_collection_with_deprecated_partial_path - assert_deprecated(/#model_name.*#partial_path.*#to_path/) do + assert_deprecated(/#model_name.*#partial_path.*#to_partial_path/) do customers = [ CustomerWithDeprecatedPartialPath.new("nertzy"), CustomerWithDeprecatedPartialPath.new("peeja") |