1 files changed, 18 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/commands_tasks.rb b/railties/lib/rails/commands/commands_tasks.rb
index 6cfbc70c51..685d55eea8 100644
--- a/railties/lib/rails/commands/commands_tasks.rb
+++ b/railties/lib/rails/commands/commands_tasks.rb
@@ -14,6 +14,7 @@ The most common rails commands are:
  generate    Generate new code (short-cut alias: "g")
  console     Start the Rails console (short-cut alias: "c")
  server      Start the Rails server (short-cut alias: "s")
+ test        Run tests (short-cut alias: "t")
  dbconsole   Start a console for the database specified in config/database.yml
              (short-cut alias: "db")
  new         Create a new Rails application. "rails new my_app" creates a
@@ -27,7 +28,7 @@ In addition to those, there are:
 All commands can be run with -h (or --help) for more information.
 EOT
 
-    COMMAND_WHITELIST = %w(plugin generate destroy console server dbconsole runner new version help)
+    COMMAND_WHITELIST = %w(plugin generate destroy console server dbconsole runner new version help test)
 
     def initialize(argv)
       @argv = argv
@@ -81,6 +82,10 @@ EOT
       end
     end
 
+    def test
+      require_command!("test")
+    end
+
     def dbconsole
       require_command!("dbconsole")
       Rails::DBConsole.start
@@ -127,7 +132,7 @@ EOT
         require 'rails/generators'
         require_application_and_environment!
         Rails.application.load_generators
-        require "rails/commands/#{command}"
+        require_command!(command)
       end
 
       # Change to the application's path if there is no config.ru file in current directory.
@@ -146,6 +151,17 @@ EOT
         puts HELP_MESSAGE
       end
 
+      # Output an error message stating that the attempted command is not a valid rails command.
+      # Run the attempted command as a rake command with the --dry-run flag. If successful, suggest
+      # to the user that they possibly meant to run the given rails command as a rake command.
+      # Append the help message.
+      #
+      #   Example:
+      #   $ rails db:migrate
+      #   Error: Command 'db:migrate' not recognized
+      #   Did you mean: `$ rake db:migrate` ?
+      #   (Help message output)
+      #
       def write_error_message(command)
         puts "Error: Command '#{command}' not recognized"
         if %x{rake #{command} --dry-run 2>&1 } && $?.success?