Merge pull request #23436 from y-yagi/use_bin_command_in_routes_task

use rails command in routes task

2 files changed, 10 insertions, 10 deletions

diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 353b8b4e72..939fa59c75 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -9,8 +9,8 @@ task routes: :environment do
   inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
   if ARGV.any?{ |argv| argv.start_with? 'CONTROLLER' }
     puts <<-eow.strip_heredoc
-      Passing `CONTROLLER` to `bin/rake routes` is deprecated and will be removed in Rails 5.1.
-      Please use `bin/rake routes -c controller_name` instead.
+      Passing `CONTROLLER` to `bin/rails routes` is deprecated and will be removed in Rails 5.1.
+      Please use `bin/rails routes -c controller_name` instead.
     eow
   end
 
@@ -18,7 +18,7 @@ task routes: :environment do
   routes_filter = { controller: ENV['CONTROLLER'] } if ENV['CONTROLLER']
 
   OptionParser.new do |opts|
-    opts.banner = "Usage: rake routes [options]"
+    opts.banner = "Usage: rails routes [options]"
     opts.on("-c", "--controller [CONTROLLER]") do |controller|
       routes_filter = { controller: controller }
     end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 7171aa6e1a..745a3e3ec5 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -141,9 +141,9 @@ module ApplicationTests
         end
       RUBY
 
-      output = Dir.chdir(app_path){ `bin/rake routes CONTROLLER=cart` }
-      assert_equal ["Passing `CONTROLLER` to `bin/rake routes` is deprecated and will be removed in Rails 5.1.",
-                    "Please use `bin/rake routes -c controller_name` instead.",
+      output = Dir.chdir(app_path){ `bin/rails routes CONTROLLER=cart` }
+      assert_equal ["Passing `CONTROLLER` to `bin/rails routes` is deprecated and will be removed in Rails 5.1.",
+                    "Please use `bin/rails routes -c controller_name` instead.",
                     "Prefix Verb URI Pattern     Controller#Action",
                     "  cart GET  /cart(.:format) cart#show\n"].join("\n"), output
 
@@ -183,7 +183,7 @@ module ApplicationTests
         end
       RUBY
 
-      output = Dir.chdir(app_path){ `bin/rake routes -g show` }
+      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
     end
 
@@ -195,13 +195,13 @@ module ApplicationTests
         end
       RUBY
 
-      output = Dir.chdir(app_path){ `bin/rake routes -c cart` }
+      output = Dir.chdir(app_path){ `bin/rails routes -c cart` }
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
 
-      output = Dir.chdir(app_path){ `bin/rake routes -c Cart` }
+      output = Dir.chdir(app_path){ `bin/rails routes -c Cart` }
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
 
-      output = Dir.chdir(app_path){ `bin/rake routes -c CartController` }
+      output = Dir.chdir(app_path){ `bin/rails routes -c CartController` }
       assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end