From 2d65ff5af7c57f2b66782d40e380a33904d02bce Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sat, 18 Sep 2010 14:14:46 -0700 Subject: removing some warnings --- actionpack/lib/action_view/helpers/form_helper.rb | 4 ++-- actionpack/test/controller/assert_select_test.rb | 2 +- actionpack/test/controller/caching_test.rb | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index a49ed5e7df..ea59d328ea 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -342,8 +342,8 @@ module ActionView options[:html] ||= {} options[:html].reverse_merge!(html_options) - options[:url] ||= options[:format] ? \ - polymorphic_path(object_or_array, :format => options.delete(:format)) : \ + options[:url] ||= options[:format] ? + polymorphic_path(object_or_array, :format => options.delete(:format)) : polymorphic_path(object_or_array) end diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb index 2600dae3c5..8c2129b00f 100644 --- a/actionpack/test/controller/assert_select_test.rb +++ b/actionpack/test/controller/assert_select_test.rb @@ -729,7 +729,7 @@ EOF end def render_rjs(&block) - @controller.response_with &block + @controller.response_with(&block) get :rjs end diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 84b796ba72..a83f5155f8 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -637,7 +637,7 @@ class FragmentCachingTest < ActionController::TestCase @store.write('views/another_name', 'another_value') @store.write('views/primalgrasp', 'will not expire ;-)') - @controller.expire_fragment /name/ + @controller.expire_fragment(/name/) assert_nil @store.read('views/name') assert_nil @store.read('views/another_name') @@ -727,22 +727,22 @@ CACHED def test_fragment_caching_in_partials get :html_fragment_cached_with_partial assert_response :success - assert_match /Old fragment caching in a partial/, @response.body + assert_match(/Old fragment caching in a partial/, @response.body) assert_match "Old fragment caching in a partial", @store.read('views/test.host/functional_caching/html_fragment_cached_with_partial') end def test_render_inline_before_fragment_caching get :inline_fragment_cached assert_response :success - assert_match /Some inline content/, @response.body - assert_match /Some cached content/, @response.body + assert_match(/Some inline content/, @response.body) + assert_match(/Some cached content/, @response.body) assert_match "Some cached content", @store.read('views/test.host/functional_caching/inline_fragment_cached') end def test_fragment_caching_in_rjs_partials xhr :get, :js_fragment_cached_with_partial assert_response :success - assert_match /Old fragment caching in a partial/, @response.body + assert_match(/Old fragment caching in a partial/, @response.body) assert_match "Old fragment caching in a partial", @store.read('views/test.host/functional_caching/js_fragment_cached_with_partial') end -- cgit v1.2.3