diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/commands.rb | 3 | ||||
| -rw-r--r-- | railties/test/application/generators_test.rb | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index c8a33c1266..de5d876c18 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -14,6 +14,9 @@ case command when 'generate', 'destroy', 'plugin' if command == "plugin" && ARGV.first == "new" require "rails/commands/plugin_new" + elsif command == 'generate' && ARGV.first == "plugin_new" + puts "This generator should not be used directly as a generator. You should use `rails plugin new` command instead" + exit(1) else require APP_PATH Rails.application.require_environment! diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb index 581cc71f89..3a3e28179a 100644 --- a/railties/test/application/generators_test.rb +++ b/railties/test/application/generators_test.rb @@ -31,6 +31,12 @@ module ApplicationTests assert File.exist?(File.join(rails_root, "vendor/plugins/bukkits/test/dummy/config/application.rb")) end + test "don't allow running plugin_new generator as a generator" do + FileUtils.cd rails_root + output = `./script/rails g plugin_new vendor/plugins/bukkits` + assert_match /This generator should not be used directly as a generator. You should use `rails plugin new` command instead/, output + end + test "generators default values" do with_bare_config do |c| assert_equal(true, c.generators.colorize_logging) |