diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-20 14:35:30 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-20 14:35:30 -0700 |
| commit | 8a889dd45e088014c77f4cd799c9e5ddea0b54c6 (patch) | |
| tree | 41e54591360420dda11daf2a79cea5e21e23ceb3 | |
| parent | ac78ff76ad0dfcfd897d92b2d50ef0a811e8d4eb (diff) | |
| parent | 91bbb8e9567a4c15a5812f32d603827045277e93 (diff) | |
| download | rails-8a889dd45e088014c77f4cd799c9e5ddea0b54c6.tar.gz rails-8a889dd45e088014c77f4cd799c9e5ddea0b54c6.tar.bz2 rails-8a889dd45e088014c77f4cd799c9e5ddea0b54c6.zip | |
Merge pull request #1786 from gazay/3-1-stable-regexp-fix
Fix regexp in generators for right catching error message
| -rw-r--r-- | railties/lib/rails/generators.rb | 3 | ||||
| -rw-r--r-- | railties/test/fixtures/lib/generators/wrong_generator.rb | 3 | ||||
| -rw-r--r-- | railties/test/generators_test.rb | 6 |
3 files changed, 0 insertions, 12 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 355b05ce0b..ea9f023511 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -299,9 +299,6 @@ module Rails return rescue LoadError => e raise unless e.message =~ /#{Regexp.escape(path)}$/ - rescue NameError => e - raise unless e.message =~ /Rails::Generator([\s(::)]|$)/ - warn "[WARNING] Could not load generator #{path.inspect} because it's a Rails 2.x generator, which is not supported anymore. Error: #{e.message}.\n#{e.backtrace.join("\n")}" rescue Exception => e warn "[WARNING] Could not load generator #{path.inspect}. Error: #{e.message}.\n#{e.backtrace.join("\n")}" end diff --git a/railties/test/fixtures/lib/generators/wrong_generator.rb b/railties/test/fixtures/lib/generators/wrong_generator.rb deleted file mode 100644 index 6aa7cb052e..0000000000 --- a/railties/test/fixtures/lib/generators/wrong_generator.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Old generator version -class WrongGenerator < Rails::Generator::NamedBase -end diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 301ae80bcf..56329f3183 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -88,12 +88,6 @@ class GeneratorsTest < Rails::Generators::TestCase assert Rails::Generators.find_by_namespace(:model) end - def test_find_by_namespace_show_warning_if_generator_cant_be_loaded - output = capture(:stderr) { Rails::Generators.find_by_namespace(:wrong) } - assert_match(/\[WARNING\] Could not load generator/, output) - assert_match(/Rails 2\.x generator/, output) - end - def test_invoke_with_nested_namespaces model_generator = mock('ModelGenerator') do expects(:start).with(["Account"], {}) |