1 files changed, 107 insertions, 0 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index ffcdeac7f0..22de640236 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -15,6 +15,12 @@ module ApplicationTests
       teardown_app
     end
 
+    test "rails/welcome in development" do
+      app("development")
+      get "/"
+      assert_equal 200, last_response.status
+    end
+
     test "rails/info/routes in development" do
       app("development")
       get "/rails/info/routes"
@@ -27,6 +33,36 @@ module ApplicationTests
       assert_equal 200, last_response.status
     end
 
+    test "root takes precedence over internal welcome controller" do
+      app("development")
+
+      get '/'
+      assert_match %r{<h1>Getting started</h1>} , last_response.body
+
+      controller :foo, <<-RUBY
+        class FooController < ApplicationController
+          def index
+            render text: "foo"
+          end
+        end
+      RUBY
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          root to: "foo#index"
+        end
+      RUBY
+
+      get '/'
+      assert_equal 'foo', last_response.body
+    end
+
+    test "rails/welcome in production" do
+      app("production")
+      get "/"
+      assert_equal 404, last_response.status
+    end
+
     test "rails/info/routes in production" do
       app("production")
       get "/rails/info/routes"
@@ -241,6 +277,77 @@ module ApplicationTests
       end
     end
 
+    test 'routes are added and removed when reloading' do
+      app('development')
+
+      controller :foo, <<-RUBY
+        class FooController < ApplicationController
+          def index
+            render text: "foo"
+          end
+        end
+      RUBY
+
+      controller :bar, <<-RUBY
+        class BarController < ApplicationController
+          def index
+            render text: "bar"
+          end
+        end
+      RUBY
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get 'foo', to: 'foo#index'
+        end
+      RUBY
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+      assert_equal '/foo', Rails.application.routes.url_helpers.foo_path
+
+      get '/bar'
+      assert_equal 404, last_response.status
+      assert_raises NoMethodError do
+        assert_equal '/bar', Rails.application.routes.url_helpers.bar_path
+      end
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get 'foo', to: 'foo#index'
+          get 'bar', to: 'bar#index'
+        end
+      RUBY
+
+      Rails.application.reload_routes!
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+      assert_equal '/foo', Rails.application.routes.url_helpers.foo_path
+
+      get '/bar'
+      assert_equal 'bar', last_response.body
+      assert_equal '/bar', Rails.application.routes.url_helpers.bar_path
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get 'foo', to: 'foo#index'
+        end
+      RUBY
+
+      Rails.application.reload_routes!
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+      assert_equal '/foo', Rails.application.routes.url_helpers.foo_path
+
+      get '/bar'
+      assert_equal 404, last_response.status
+      assert_raises NoMethodError do
+        assert_equal '/bar', Rails.application.routes.url_helpers.bar_path
+      end
+    end
+
     test 'resource routing with irregular inflection' do
       app_file 'config/initializers/inflection.rb', <<-RUBY
         ActiveSupport::Inflector.inflections do |inflect|