From e4a0a048836512432b43c7fb623d32de2496a346 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 22 Apr 2018 14:30:07 +0900 Subject: Strip duplicated suffixes more strictly In the previous code incorrectly removes intermediate words. --- railties/lib/rails/generators/test_unit/job/job_generator.rb | 2 +- railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/generators/test_unit') diff --git a/railties/lib/rails/generators/test_unit/job/job_generator.rb b/railties/lib/rails/generators/test_unit/job/job_generator.rb index ab622ec5e4..1dae3cb6a5 100644 --- a/railties/lib/rails/generators/test_unit/job/job_generator.rb +++ b/railties/lib/rails/generators/test_unit/job/job_generator.rb @@ -13,7 +13,7 @@ module TestUnit # :nodoc: private def file_name - @_file_name ||= super.gsub(/_job/i, "") + @_file_name ||= super.sub(/_job\z/i, "") end end end diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index 610d47a729..ab8331f31c 100644 --- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb @@ -21,7 +21,7 @@ module TestUnit # :nodoc: private def file_name - @_file_name ||= super.gsub(/_mailer/i, "") + @_file_name ||= super.sub(/_mailer\z/i, "") end end end -- cgit v1.2.3