aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-02-24 10:31:11 -0500
committerGitHub <noreply@github.com>2017-02-24 10:31:11 -0500
commitaa56dc235a341876762f0219738cac46d181fcd3 (patch)
treecf561ac5f7dba4346c4de72639519a48e01868c3
parentd27398420316f39a5b2248589811fe5f09b24ab3 (diff)
parent87a8206dbca1d6992e91eeea9a6c56e7c53e0ef1 (diff)
downloadrails-aa56dc235a341876762f0219738cac46d181fcd3.tar.gz
rails-aa56dc235a341876762f0219738cac46d181fcd3.tar.bz2
rails-aa56dc235a341876762f0219738cac46d181fcd3.zip
Merge pull request #28150 from y-yagi/do_not_display_hidden_namespaces_in_generators_help
does not show hidden namespaces in generator's help
-rw-r--r--railties/lib/rails/commands/generate/generate_command.rb3
-rw-r--r--railties/test/application/generators_test.rb7
2 files changed, 10 insertions, 0 deletions
diff --git a/railties/lib/rails/commands/generate/generate_command.rb b/railties/lib/rails/commands/generate/generate_command.rb
index aa8dab71b0..2718b453a8 100644
--- a/railties/lib/rails/commands/generate/generate_command.rb
+++ b/railties/lib/rails/commands/generate/generate_command.rb
@@ -4,6 +4,9 @@ module Rails
module Command
class GenerateCommand < Base # :nodoc:
def help
+ require_application_and_environment!
+ load_generators
+
Rails::Generators.help self.class.command_name
end
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index d2ce14f594..ee0d697599 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -184,5 +184,12 @@ module ApplicationTests
Rails::Command.send(:remove_const, "APP_PATH")
end
+
+ test "help does not show hidden namespaces" do
+ FileUtils.cd(rails_root) do
+ output = `bin/rails generate --help`
+ assert_no_match "active_record:migration", output
+ end
+ end
end
end