diff options
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 60ed5a5db5..4c53248762 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -70,7 +70,7 @@ module Rails desc: 'Skip turbolinks gem' class_option :skip_test, type: :boolean, aliases: '-T', default: false, - desc: 'Skip ActiveSupport::TestCase files' + desc: 'Skip test files' class_option :rc, type: :string, default: false, desc: "Path to file containing extra configuration options for rails command" diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 2ceae75ad5..f67be97e79 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -339,7 +339,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase end end - def test_skipping_test_unit + def test_skipping_test_files run_generator [destination_root, "--skip-test"] assert_no_file "test" assert_file "bukkits.gemspec" do |contents| diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 36b9241c08..68f07f29d7 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -47,7 +47,7 @@ module SharedGeneratorTests assert_match(/Invalid value for \-\-database option/, content) end - def test_test_unit_is_skipped_if_required + def test_test_files_are_skipped_if_required run_generator [destination_root, "--skip-test"] assert_no_file "test" end |