mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Fix routes generation for unit tests. #1434
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1497 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -383,6 +383,10 @@ module ActionController
|
||||
def generate_path(merged, options, expire_on)
|
||||
send @generation_methods[merged[:controller]], merged, options, expire_on
|
||||
end
|
||||
def generate_default_path(*args)
|
||||
write_generation
|
||||
generate_default_path(*args)
|
||||
end
|
||||
|
||||
def write_generation
|
||||
@generation_methods = Hash.new(:generate_default_path)
|
||||
@@ -499,7 +503,11 @@ module ActionController
|
||||
|
||||
def reload
|
||||
NamedRoutes.clear
|
||||
load(File.join(RAILS_ROOT, 'config', 'routes.rb'))
|
||||
|
||||
if defined?(RAILS_ROOT) then load(File.join(RAILS_ROOT, 'config', 'routes.rb'))
|
||||
else connect(':controller/:action/:id', :action => 'index', :id => nil)
|
||||
end
|
||||
|
||||
NamedRoutes.install
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user