aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorschneems <richard.schneeman@gmail.com>2013-07-01 00:02:19 +0300
committerschneems <richard.schneeman@gmail.com>2013-06-30 22:03:39 -0400
commitec8d8652f36bc4bf2ea19b8f7dd264187efc99ae (patch)
tree39e4d63bf6d81339a2db3f46558401a350561cea /railties/test
parent6e583cdac30332f10c73bec4fe3e857b7cdb9975 (diff)
downloadrails-ec8d8652f36bc4bf2ea19b8f7dd264187efc99ae.tar.gz
rails-ec8d8652f36bc4bf2ea19b8f7dd264187efc99ae.tar.bz2
rails-ec8d8652f36bc4bf2ea19b8f7dd264187efc99ae.zip
s/plugin_new/plugin
There are historical reasons that the `plugin` command was `plugin_new`, now those are no longer applicable, we should remove the naming edge case from the project. This PR is based off of comments from #11176 ATP Railties
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.rb2
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