kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Sidestep need for Kernel#silence_warnings

This commit is contained in:
Jeremy Kemper 2009-05-29 21:57:51 -05:00
parent c79551f02b
commit f9bd10054c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actionpack/test/controller/routing_test.rb
View File

@ -649,9 +649,8 @@ class RoutingTest < Test::Unit::TestCase
ActionController::Routing.use_controllers! nil ActionController::Routing.use_controllers! nil
silence_warnings do Object.send(:remove_const, :RAILS_ROOT) if defined?(::RAILS_ROOT)
Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + '/controller_fixtures') Object.const_set(:RAILS_ROOT, File.dirname(__FILE__) + '/controller_fixtures')
end
ActionController::Routing.controller_paths = [ ActionController::Routing.controller_paths = [
RAILS_ROOT, RAILS_ROOT + '/app/controllers', RAILS_ROOT + '/vendor/plugins/bad_plugin/lib' RAILS_ROOT, RAILS_ROOT + '/app/controllers', RAILS_ROOT + '/vendor/plugins/bad_plugin/lib'
@ -2487,7 +2486,8 @@ end
class RouteLoadingTest < Test::Unit::TestCase class RouteLoadingTest < Test::Unit::TestCase
def setup def setup
routes.instance_variable_set '@routes_last_modified', nil routes.instance_variable_set '@routes_last_modified', nil
silence_warnings { Object.const_set :RAILS_ROOT, '.' } Object.remove_const(:RAILS_ROOT) if defined?(::RAILS_ROOT)
Object.const_set :RAILS_ROOT, '.'
routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb')) routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
@stat = stub_everything @stat = stub_everything