diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-12-13 02:57:00 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-12-13 02:57:00 +0900 |
commit | 8fcaf3c26cd83d181e108f686f0e002751e9a3b7 (patch) | |
tree | 76f74e4fd5e8d06300e5d1aaeeb77cf81260fc8e /railties | |
parent | 047d4f260555b4c69fe6ae2d09d4a4cd95fad79a (diff) | |
parent | 886ac1c3087f8ac06bee371af54758fb02760e63 (diff) | |
download | rails-8fcaf3c26cd83d181e108f686f0e002751e9a3b7.tar.gz rails-8fcaf3c26cd83d181e108f686f0e002751e9a3b7.tar.bz2 rails-8fcaf3c26cd83d181e108f686f0e002751e9a3b7.zip |
Merge pull request #34691 from gmcgibbon/rm_helper_generator_suffix
Remove redundant suffixes on generated helpers.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/helper_generator.rb | 5 | ||||
-rw-r--r-- | railties/test/generators/helper_generator_test.rb | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 7ccb06953b..ff6a00f82b 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove redundant suffixes on generated helpers. + + *Gannon McGibbon* + * Remove redundant suffixes on generated integration tests. *Gannon McGibbon* diff --git a/railties/lib/rails/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb index 3837c10ca0..542eb4c9e8 100644 --- a/railties/lib/rails/generators/rails/helper/helper_generator.rb +++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb @@ -10,6 +10,11 @@ module Rails end hook_for :test_framework + + private + def file_name + @_file_name ||= super.sub(/_helper\z/i, "") + end end end end diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 4cdb6adf82..5d6b6f8f67 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -38,4 +38,11 @@ class HelperGeneratorTest < Rails::Generators::TestCase end end end + + def test_helper_suffix_is_not_duplicated + run_generator %w(products_helper) + + assert_no_file "app/helpers/products_helper_helper.rb" + assert_file "app/helpers/products_helper.rb" + end end |