diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-14 16:51:13 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-14 16:51:13 -0600 |
commit | ec99eca013ce96fa1fa628510038a9eafa46d3c5 (patch) | |
tree | acc299e0fe3fcaa04268b875e4ef4fe3b9bbc6cf /railties/test/application | |
parent | 70c3e825fc184c7267d226c7b365af4db17f58b7 (diff) | |
download | rails-ec99eca013ce96fa1fa628510038a9eafa46d3c5.tar.gz rails-ec99eca013ce96fa1fa628510038a9eafa46d3c5.tar.bz2 rails-ec99eca013ce96fa1fa628510038a9eafa46d3c5.zip |
Fix loading plugin and engine route sets
Diffstat (limited to 'railties/test/application')
-rw-r--r-- | railties/test/application/routing_test.rb | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index 1bfec3805b..752218b943 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -81,5 +81,43 @@ module ApplicationTests get '/admin/foo' assert_equal 'admin::foo', last_response.body end + + test "merges with plugin routes" do + controller 'foo', <<-RUBY + class FooController < ActionController::Base + def index + render :text => "foo" + end + end + RUBY + + app_file 'config/routes.rb', <<-RUBY + ActionController::Routing::Routes.draw do |map| + match 'foo', :to => 'foo#index' + end + RUBY + + plugin 'bar', 'require File.dirname(__FILE__) + "/app/controllers/bar"' do |plugin| + plugin.write 'app/controllers/bar.rb', <<-RUBY + class BarController < ActionController::Base + def index + render :text => "bar" + end + end + RUBY + + plugin.write 'config/routes.rb', <<-RUBY + ActionController::Routing::Routes.draw do |map| + match 'bar', :to => 'bar#index' + end + RUBY + end + + get '/foo' + assert_equal 'foo', last_response.body + + get '/bar' + assert_equal 'bar', last_response.body + end end end |