Make help short-cut alias to work

2 files changed, 24 insertions, 1 deletions

diff --git a/railties/lib/rails/command.rb b/railties/lib/rails/command.rb
index dd16e4c66a..0d4e6dc5a1 100644
--- a/railties/lib/rails/command.rb
+++ b/railties/lib/rails/command.rb
@@ -36,7 +36,7 @@ module Rails
           command_name = namespace
         end
 
-        command_name = "help" if command_name.blank? || HELP_MAPPINGS.include?(command_name)
+        command_name, namespace = "help", "help" if command_name.blank? || HELP_MAPPINGS.include?(command_name)
         command_name, namespace = "version", "version" if %w( -v --version ).include?(command_name)
 
         command = find_by_namespace(namespace, command_name)
diff --git a/railties/test/application/help_test.rb b/railties/test/application/help_test.rb
new file mode 100644
index 0000000000..0c3fe8bfa3
--- /dev/null
+++ b/railties/test/application/help_test.rb
@@ -0,0 +1,23 @@
+require "isolation/abstract_unit"
+
+class HelpTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def setup
+    build_app
+  end
+
+  def teardown
+    teardown_app
+  end
+
+  test "command works" do
+    output = Dir.chdir(app_path) { `bin/rails help` }
+    assert_match "The most common rails commands are", output
+  end
+
+  test "short-cut alias works" do
+    output = Dir.chdir(app_path) { `bin/rails -h` }
+    assert_match "The most common rails commands are", output
+  end
+end