Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets

Display custom asset routes in `rake routes`

2 files changed, 10 insertions, 1 deletions

diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index bd35ea812b..a0c953967c 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -17,7 +17,7 @@ task :routes => :environment do
   end
 
    # Skip the route if it's internal info route
-  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|/assets} }
+  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
 
   name_width = routes.map{ |r| r[:name].length }.max
   verb_width = routes.map{ |r| r[:verb].length }.max
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 59e5ef4dee..a8bcf7beaf 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -64,6 +64,15 @@ module ApplicationTests
       assert_match 'cart GET /cart(.:format)', Dir.chdir(app_path){ `rake routes` }
     end
 
+    def test_rake_routes_shows_custom_assets
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get '/custom/assets', :to => 'custom_assets#show'
+        end
+      RUBY
+      assert_match 'custom_assets GET /custom/assets(.:format)', Dir.chdir(app_path){ `rake routes` }
+    end
+
     def test_model_and_migration_generator_with_change_syntax
       Dir.chdir(app_path) do
         `rails generate model user username:string password:string`