diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-22 13:23:35 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-22 13:23:35 +0900 |
commit | 26749d37fa7ceb4d1a9d98147029145e9aabfa40 (patch) | |
tree | fe9a3f0141a37468e5ed629ec36b79cd1cc19599 /railties | |
parent | cc1526171ed8ab59a2d5eeb15a07f8cf4bbd366f (diff) | |
parent | 8e2c91df4a8d4f336fe27ec98bd1dfd4934ac9fe (diff) | |
download | rails-26749d37fa7ceb4d1a9d98147029145e9aabfa40.tar.gz rails-26749d37fa7ceb4d1a9d98147029145e9aabfa40.tar.bz2 rails-26749d37fa7ceb4d1a9d98147029145e9aabfa40.zip |
Merge pull request #32685 from yhirano55/fix-duplicated-suffix-for-job-generator
Fix duplicated suffix for JobGenerator
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/generators/test_unit/job/job_generator.rb | 5 | ||||
-rw-r--r-- | railties/test/generators/job_generator_test.rb | 10 |
2 files changed, 15 insertions, 0 deletions
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 a99ce914c0..ab622ec5e4 100644 --- a/railties/lib/rails/generators/test_unit/job/job_generator.rb +++ b/railties/lib/rails/generators/test_unit/job/job_generator.rb @@ -10,6 +10,11 @@ module TestUnit # :nodoc: def create_test_file template "unit_test.rb", File.join("test/jobs", class_path, "#{file_name}_job_test.rb") end + + private + def file_name + @_file_name ||= super.gsub(/_job/i, "") + end end end end diff --git a/railties/test/generators/job_generator_test.rb b/railties/test/generators/job_generator_test.rb index 13276fac65..234ba6dad7 100644 --- a/railties/test/generators/job_generator_test.rb +++ b/railties/test/generators/job_generator_test.rb @@ -35,4 +35,14 @@ class JobGeneratorTest < Rails::Generators::TestCase assert_match(/class ApplicationJob < ActiveJob::Base/, job) end end + + def test_job_suffix_is_not_duplicated + run_generator ["notifier_job"] + + assert_no_file "app/jobs/notifier_job_job.rb" + assert_file "app/jobs/notifier_job.rb" + + assert_no_file "test/jobs/notifier_job_job_test.rb" + assert_file "test/jobs/notifier_job_test.rb" + end end |