diff options
| author | lest <just.lest@gmail.com> | 2011-11-30 18:34:16 +0300 |
|---|---|---|
| committer | lest <just.lest@gmail.com> | 2011-11-30 18:57:12 +0300 |
| commit | 565d92f57891c1114801a27cf45ba8ee4ec02cf9 (patch) | |
| tree | 9e2cea346c9297f18db819769564747c715f3450 | |
| parent | 2b96b20f3a8deff61d9a8dd5866cae5251ea5e1c (diff) | |
| download | rails-565d92f57891c1114801a27cf45ba8ee4ec02cf9.tar.gz rails-565d92f57891c1114801a27cf45ba8ee4ec02cf9.tar.bz2 rails-565d92f57891c1114801a27cf45ba8ee4ec02cf9.zip | |
fix method redefined warnings in tests
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/controller/url_for_integration_test.rb | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 680d562379..d191a203dd 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -351,3 +351,8 @@ module ActionDispatch end end +module RoutingTestHelpers + def url_for(set, options, recall = nil) + set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall)) + end +end diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 5bf68decca..4a67380f59 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -11,12 +11,6 @@ end ROUTING = ActionDispatch::Routing -module RoutingTestHelpers - def url_for(set, options, recall = nil) - set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall)) - end -end - # See RFC 3986, section 3.3 for allowed path characters. class UriReservedCharactersRoutingTest < Test::Unit::TestCase include RoutingTestHelpers diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb index 7b734ff0fb..451ea6027d 100644 --- a/actionpack/test/controller/url_for_integration_test.rb +++ b/actionpack/test/controller/url_for_integration_test.rb @@ -3,12 +3,6 @@ require 'abstract_unit' require 'controller/fake_controllers' require 'active_support/core_ext/object/with_options' -module RoutingTestHelpers - def url_for(set, options, recall = nil) - set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall)) - end -end - module ActionPack class URLForIntegrationTest < ActiveSupport::TestCase include RoutingTestHelpers |