1 files changed, 23 insertions, 16 deletions

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 745a3e3ec5..1a786a3fd3 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -24,7 +24,7 @@ module ApplicationTests
       assert $task_loaded
     end
 
-    def test_the_test_rake_task_is_protected_when_previous_migration_was_production
+    test "task is protected when previous migration was production" do
       Dir.chdir(app_path) do
         output = `bin/rails generate model product name:string;
          env RAILS_ENV=production bin/rails db:create db:migrate;
@@ -118,11 +118,11 @@ module ApplicationTests
     end
 
     def test_code_statistics_sanity
-      assert_match "Code LOC: 14     Test LOC: 0     Code to Test Ratio: 1:0.0",
+      assert_match "Code LOC: 18     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path){ `bin/rails stats` }
     end
 
-    def test_rake_routes_calls_the_route_inspector
+    def test_rails_routes_calls_the_route_inspector
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           get '/cart', to: 'cart#show'
@@ -133,7 +133,7 @@ module ApplicationTests
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end
 
-    def test_rake_routes_with_controller_environment
+    def test_rails_routes_with_controller_environment
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           get '/cart', to: 'cart#show'
@@ -151,7 +151,7 @@ module ApplicationTests
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end
 
-    def test_rake_routes_with_namespaced_controller_environment
+    def test_rails_routes_with_namespaced_controller_environment
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           namespace :admin do
@@ -175,19 +175,27 @@ module ApplicationTests
       assert_equal expected_output, output
     end
 
-    def test_rake_routes_with_global_search_key
+    def test_rails_routes_with_global_search_key
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           get '/cart', to: 'cart#show'
-          get '/basketball', to: 'basketball#index'
+          post '/cart', to: 'cart#create'
+          get '/basketballs', to: 'basketball#index'
         end
       RUBY
 
       output = Dir.chdir(app_path){ `bin/rails routes -g show` }
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
+
+      output = Dir.chdir(app_path){ `bin/rails routes -g POST` }
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\n       POST /cart(.:format) cart#create\n", output
+
+      output = Dir.chdir(app_path){ `bin/rails routes -g basketballs` }
+      assert_equal "     Prefix Verb URI Pattern            Controller#Action\n" \
+                   "basketballs GET  /basketballs(.:format) basketball#index\n", output
     end
 
-    def test_rake_routes_with_controller_search_key
+    def test_rails_routes_with_controller_search_key
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           get '/cart', to: 'cart#show'
@@ -205,7 +213,7 @@ module ApplicationTests
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end
 
-    def test_rake_routes_displays_message_when_no_routes_are_defined
+    def test_rails_routes_displays_message_when_no_routes_are_defined
       app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
         end
@@ -291,12 +299,11 @@ module ApplicationTests
       assert_no_match(/Errors running/, output)
     end
 
-    def test_scaffold_with_references_columns_tests_pass_when_belongs_to_is_optional
-      app_file "config/initializers/active_record_belongs_to_required_by_default.rb",
-        "Rails.application.config.active_record.belongs_to_required_by_default = false"
-
+    def test_scaffold_with_references_columns_tests_pass_by_default
       output = Dir.chdir(app_path) do
-        `bin/rails generate scaffold LineItems product:references cart:belongs_to;
+        `bin/rails generate model Product;
+         bin/rails generate model Cart;
+         bin/rails generate scaffold LineItems product:references cart:belongs_to;
          RAILS_ENV=test bin/rails db:migrate test`
       end
 
@@ -362,7 +369,7 @@ module ApplicationTests
 
     def test_copy_templates
       Dir.chdir(app_path) do
-        `bin/rails rails:templates:copy`
+        `bin/rails app:templates:copy`
         %w(controller mailer scaffold).each do |dir|
           assert File.exist?(File.join(app_path, 'lib', 'templates', 'erb', dir))
         end
@@ -377,7 +384,7 @@ module ApplicationTests
       app_file "template.rb", ""
 
       output = Dir.chdir(app_path) do
-        `bin/rails rails:template LOCATION=template.rb`
+        `bin/rails app:template LOCATION=template.rb`
       end
 
       assert_match(/Hello, World!/, output)