提交 ba57575e 编写于 作者: C Carl Lerche

Remove references to ActionDispatch::Routing::Routes in favor of Rails.appication.routes.

上级 60ca754b
path File.dirname(__FILE__) path File.dirname(__FILE__)
source 'http://gemcutter.org' source 'http://rubygems.org'
gem "rails", "3.0.0.beta1" gem "rails", "3.0.0.beta1"
......
ActionDispatch::Routing::Routes.draw do |map| Rails.application.routes.draw do |map|
match '/rails/info/properties' => "rails/info#properties" match '/rails/info/properties' => "rails/info#properties"
end end
desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.' desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
task :routes => :environment do task :routes => :environment do
Rails::Application.reload_routes! Rails::Application.reload_routes!
all_routes = ENV['CONTROLLER'] ? ActionDispatch::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionDispatch::Routing::Routes.routes all_routes = ENV['CONTROLLER'] ? Rails.application.routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : Rails.application.routes.routes
routes = all_routes.collect do |route| routes = all_routes.collect do |route|
name = ActionDispatch::Routing::Routes.named_routes.routes.index(route).to_s name = Rails.application.routes.named_routes.routes.index(route).to_s
reqs = route.requirements.empty? ? "" : route.requirements.inspect reqs = route.requirements.empty? ? "" : route.requirements.inspect
{:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs} {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
end end
......
...@@ -14,7 +14,7 @@ class InfoControllerTest < ActionController::TestCase ...@@ -14,7 +14,7 @@ class InfoControllerTest < ActionController::TestCase
tests Rails::InfoController tests Rails::InfoController
def setup def setup
ActionDispatch::Routing::Routes.draw do |map| Rails.application.routes.draw do |map|
match ':controller/:action' match ':controller/:action'
end end
@controller.stubs(:consider_all_requests_local? => false, :local_request? => true) @controller.stubs(:consider_all_requests_local? => false, :local_request? => true)
......
...@@ -133,7 +133,7 @@ def self.call(env) ...@@ -133,7 +133,7 @@ def self.call(env)
end end
end end
ActionDispatch::Routing::Routes.draw do Rails.application.routes.draw do
match "/sprokkit", :to => Sprokkit match "/sprokkit", :to => Sprokkit
end end
RUBY RUBY
...@@ -170,7 +170,7 @@ def index ...@@ -170,7 +170,7 @@ def index
RUBY RUBY
@plugin.write "config/routes.rb", <<-RUBY @plugin.write "config/routes.rb", <<-RUBY
ActionDispatch::Routing::Routes.draw do |map| Rails.application.routes.draw do |map|
match 'foo', :to => 'bar#index' match 'foo', :to => 'bar#index'
match 'bar', :to => 'bar#index' match 'bar', :to => 'bar#index'
end end
...@@ -261,7 +261,7 @@ def self.call(env) ...@@ -261,7 +261,7 @@ def self.call(env)
def test_namespaced_controllers_with_namespaced_routes def test_namespaced_controllers_with_namespaced_routes
@plugin.write "config/routes.rb", <<-RUBY @plugin.write "config/routes.rb", <<-RUBY
ActionDispatch::Routing::Routes.draw do Rails.application.routes.draw do
namespace :admin do namespace :admin do
match "index", :to => "admin/foo#index" match "index", :to => "admin/foo#index"
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册