mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
list reserved words in generator error
This commit is contained in:
parent
3ed6d2f352
commit
672ae71080
4 changed files with 4 additions and 4 deletions
|
@ -319,7 +319,7 @@ module Rails
|
|||
if app_const =~ /^\d/
|
||||
raise Error, "Invalid application name #{app_name}. Please give a name which does not start with numbers."
|
||||
elsif RESERVED_NAMES.include?(app_name)
|
||||
raise Error, "Invalid application name #{app_name}. Please give a name which does not match one of the reserved rails words."
|
||||
raise Error, "Invalid application name #{app_name}. Please give a name which does not match one of the reserved rails words: #{RESERVED_NAMES}"
|
||||
elsif Object.const_defined?(app_const_base)
|
||||
raise Error, "Invalid application name #{app_name}, constant #{app_const_base} is already in use. Please choose another application name."
|
||||
end
|
||||
|
|
|
@ -364,7 +364,7 @@ task default: :test
|
|||
elsif camelized =~ /^\d/
|
||||
raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers."
|
||||
elsif RESERVED_NAMES.include?(name)
|
||||
raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words."
|
||||
raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words: #{RESERVED_NAMES}"
|
||||
elsif Object.const_defined?(camelized)
|
||||
raise Error, "Invalid plugin name #{original_name}, constant #{camelized} is already in use. Please choose another plugin name."
|
||||
end
|
||||
|
|
|
@ -38,7 +38,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
|
|||
assert_equal "Invalid plugin name 43things. Please give a name which does not start with numbers.\n", content
|
||||
|
||||
content = capture(:stderr){ run_generator [File.join(destination_root, "plugin")] }
|
||||
assert_equal "Invalid plugin name plugin. Please give a name which does not match one of the reserved rails words.\n", content
|
||||
assert_equal "Invalid plugin name plugin. Please give a name which does not match one of the reserved rails words: [\"application\", \"destroy\", \"plugin\", \"runner\", \"test\"]\n", content
|
||||
|
||||
content = capture(:stderr){ run_generator [File.join(destination_root, "Digest")] }
|
||||
assert_equal "Invalid plugin name Digest, constant Digest is already in use. Please choose another plugin name.\n", content
|
||||
|
|
|
@ -56,7 +56,7 @@ module SharedGeneratorTests
|
|||
reserved_words = %w[application destroy plugin runner test]
|
||||
reserved_words.each do |reserved|
|
||||
content = capture(:stderr){ run_generator [File.join(destination_root, reserved)] }
|
||||
assert_match(/Invalid \w+ name #{reserved}. Please give a name which does not match one of the reserved rails words.\n/, content)
|
||||
assert_match(/Invalid \w+ name #{reserved}. Please give a name which does not match one of the reserved rails words: \["application", "destroy", "plugin", "runner", "test"\]\n/, content)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue