1 files changed, 102 insertions, 31 deletions
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index add8256b5d..3b8c874b5b 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -1,84 +1,120 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'rails/application/route_inspector'
 require 'action_controller'
+require 'rails/engine'
 
 module ApplicationTests
-  class RouteInspectTest < Test::Unit::TestCase
+  class RouteInspectTest < ActiveSupport::TestCase
     def setup
       @set = ActionDispatch::Routing::RouteSet.new
       @inspector = Rails::Application::RouteInspector.new
+      app = ActiveSupport::OrderedOptions.new
+      app.config = ActiveSupport::OrderedOptions.new
+      app.config.assets = ActiveSupport::OrderedOptions.new
+      app.config.assets.prefix = '/sprockets'
+      Rails.stubs(:application).returns(app)
+      Rails.stubs(:env).returns("development")
+    end
+
+    def draw(&block)
+      @set.draw(&block)
+      @inspector.format(@set.routes)
+    end
+
+    def test_displaying_routes_for_engines
+      engine = Class.new(Rails::Engine) do
+        def self.to_s
+          "Blog::Engine"
+        end
+      end
+      engine.routes.draw do
+        get '/cart', :to => 'cart#show'
+      end
+
+      output = draw do
+        get '/custom/assets', :to => 'custom_assets#show'
+        mount engine => "/blog", :as => "blog"
+      end
+
+      expected = [
+        "custom_assets GET /custom/assets(.:format) custom_assets#show",
+        "         blog     /blog                    Blog::Engine",
+        "\nRoutes for Blog::Engine:",
+        "cart GET /cart(.:format) cart#show"
+      ]
+      assert_equal expected, output
     end
 
     def test_cart_inspect
-      @set.draw do
+      output = draw do
         get '/cart', :to => 'cart#show'
       end
-      output = @inspector.format @set.routes
       assert_equal ["cart GET /cart(.:format) cart#show"], output
     end
 
     def test_inspect_shows_custom_assets
-      @set.draw do
+      output = draw do
         get '/custom/assets', :to => 'custom_assets#show'
       end
-      output = @inspector.format @set.routes
       assert_equal ["custom_assets GET /custom/assets(.:format) custom_assets#show"], output
     end
 
     def test_inspect_routes_shows_resources_route
-      @set.draw do
+      output = draw do
         resources :articles
       end
-      output = @inspector.format @set.routes
       expected = [
         "    articles GET    /articles(.:format)          articles#index",
         "             POST   /articles(.:format)          articles#create",
         " new_article GET    /articles/new(.:format)      articles#new",
         "edit_article GET    /articles/:id/edit(.:format) articles#edit",
         "     article GET    /articles/:id(.:format)      articles#show",
+        "             PATCH  /articles/:id(.:format)      articles#update",
         "             PUT    /articles/:id(.:format)      articles#update",
         "             DELETE /articles/:id(.:format)      articles#destroy" ]
       assert_equal expected, output
     end
 
     def test_inspect_routes_shows_root_route
-      @set.draw do
+      output = draw do
         root :to => 'pages#main'
       end
-      output = @inspector.format @set.routes
-      assert_equal ["root  / pages#main"], output
+      assert_equal ["root GET / pages#main"], output
+    end
+
+    def test_inspect_routes_shows_dynamic_action_route
+      output = draw do
+        get 'api/:action' => 'api'
+      end
+      assert_equal [" GET /api/:action(.:format) api#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_only_route
-      @set.draw do
-        match ':controller/:action'
+      output = draw do
+        get ':controller/:action'
       end
-      output = @inspector.format @set.routes
-      assert_equal ["  /:controller/:action(.:format) "], output
+      assert_equal [" GET /:controller/:action(.:format) :controller#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_route_with_constraints
-      @set.draw do
-        match ':controller(/:action(/:id))', :id => /\d+/
+      output = draw do
+        get ':controller(/:action(/:id))', :id => /\d+/
       end
-      output = @inspector.format @set.routes
-      assert_equal ["  /:controller(/:action(/:id))(.:format) {:id=>/\\d+/}"], output
+      assert_equal [" GET /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
     end
 
     def test_rake_routes_shows_route_with_defaults
-      @set.draw do
-        match 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
+      output = draw do
+        get 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
       end
-      output = @inspector.format @set.routes
-      assert_equal [%Q[  /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
+      assert_equal [%Q[ GET /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
     end
 
     def test_rake_routes_shows_route_with_constraints
-      @set.draw do
-        match 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
+      output = draw do
+        get 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
       end
-      output = @inspector.format @set.routes
-      assert_equal ["  /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
+      assert_equal [" GET /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
     end
 
     class RackApp
@@ -87,11 +123,46 @@ module ApplicationTests
     end
 
     def test_rake_routes_shows_route_with_rack_app
-      @set.draw do
-        match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
+      output = draw do
+        get 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
+      end
+      assert_equal [" GET /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
+    end
+
+    def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
+      constraint = Class.new do
+        def to_s
+          "( my custom constraint )"
+        end
+      end
+
+      output = draw do
+        scope :constraint => constraint.new do
+          mount RackApp => '/foo'
+        end
+      end
+
+      assert_equal ["  /foo #{RackApp.name} {:constraint=>( my custom constraint )}"], output
+    end
+
+    def test_rake_routes_dont_show_app_mounted_in_assets_prefix
+      output = draw do
+        get '/sprockets' => RackApp
       end
-      output = @inspector.format @set.routes
-      assert_equal ["  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
+      assert_no_match(/RackApp/, output.first)
+      assert_no_match(/\/sprockets/, output.first)
+    end
+
+    def test_redirect
+      output = draw do
+        get "/foo"    => redirect("/foo/bar"), :constraints => { :subdomain => "admin" }
+        get "/bar"    => redirect(path: "/foo/bar", status: 307)
+        get "/foobar" => redirect{ "/foo/bar" }
+      end
+
+      assert_equal "   foo GET /foo(.:format)    redirect(301, /foo/bar) {:subdomain=>\"admin\"}", output[0]
+      assert_equal "   bar GET /bar(.:format)    redirect(307, path: /foo/bar)", output[1]
+      assert_equal "foobar GET /foobar(.:format) redirect(301)", output[2]
     end
   end
 end