From 8e2c91df4a8d4f336fe27ec98bd1dfd4934ac9fe Mon Sep 17 00:00:00 2001
From: Yoshiyuki Hirano <yhirano@me.com>
Date: Sun, 22 Apr 2018 12:09:04 +0900
Subject: [PATCH] Fix duplicated suffix for JobGenerator

---
 activejob/lib/rails/generators/job/job_generator.rb    |  4 ++++
 .../rails/generators/test_unit/job/job_generator.rb    |  5 +++++
 railties/test/generators/job_generator_test.rb         | 10 ++++++++++
 3 files changed, 19 insertions(+)

diff --git a/activejob/lib/rails/generators/job/job_generator.rb b/activejob/lib/rails/generators/job/job_generator.rb
index 69b4fe7d26..44444e7e04 100644
--- a/activejob/lib/rails/generators/job/job_generator.rb
+++ b/activejob/lib/rails/generators/job/job_generator.rb
@@ -28,6 +28,10 @@ module Rails # :nodoc:
       end
 
       private
+        def file_name
+          @_file_name ||= super.gsub(/_job/i, "")
+        end
+
         def application_job_file_name
           @application_job_file_name ||= if mountable_engine?
             "app/jobs/#{namespaced_path}/application_job.rb"
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