diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 11:36:47 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 11:36:47 -0700 |
| commit | ab6601ccdf15c5b3951b7762387f329c07e39edb (patch) | |
| tree | d576e63ff757e15e0dd48f60d6ab73ff7d7e9eb6 /railties/test | |
| parent | 6c82844fceb777f4ffb74fce3a12abe679136452 (diff) | |
| parent | ec8d8652f36bc4bf2ea19b8f7dd264187efc99ae (diff) | |
| download | rails-ab6601ccdf15c5b3951b7762387f329c07e39edb.tar.gz rails-ab6601ccdf15c5b3951b7762387f329c07e39edb.tar.bz2 rails-ab6601ccdf15c5b3951b7762387f329c07e39edb.zip | |
Merge pull request #11203 from schneems/schneems/plugin_new-plugin
s/plugin_new/plugin
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb (renamed from railties/test/generators/plugin_new_generator_test.rb) | 4 | ||||
| -rw-r--r-- | railties/test/generators_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 32c7612a8f..068eb66bc6 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'rails/generators/rails/plugin_new/plugin_new_generator' +require 'rails/generators/rails/plugin/plugin_generator' require 'generators/shared_generator_tests' DEFAULT_PLUGIN_FILES = %w( @@ -18,7 +18,7 @@ DEFAULT_PLUGIN_FILES = %w( test/dummy ) -class PluginNewGeneratorTest < Rails::Generators::TestCase +class PluginGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper destination File.join(Rails.root, "tmp/bukkits") arguments [destination_root] diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 361784f509..5130b285a9 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -106,7 +106,7 @@ class GeneratorsTest < Rails::Generators::TestCase def test_rails_generators_help_does_not_include_app_nor_plugin_new output = capture(:stdout){ Rails::Generators.help } assert_no_match(/app/, output) - assert_no_match(/plugin_new/, output) + assert_no_match(/[^:]plugin/, output) end def test_rails_generators_with_others_information |