3 files changed, 12 insertions, 5 deletions
diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb
index 8cc8eb1103..5276eb33c9 100644
--- a/railties/lib/rails/backtrace_cleaner.rb
+++ b/railties/lib/rails/backtrace_cleaner.rb
@@ -4,12 +4,16 @@ module Rails
   class BacktraceCleaner < ActiveSupport::BacktraceCleaner
     APP_DIRS_PATTERN = /^\/?(app|config|lib|test)/
     RENDER_TEMPLATE_PATTERN = /:in `_render_template_\w*'/
+    EMPTY_STRING = ''.freeze
+    SLASH        = '/'.freeze
+    DOT_SLASH    = './'.freeze
 
     def initialize
       super
-      add_filter   { |line| line.sub("#{Rails.root}/", '') }
-      add_filter   { |line| line.sub(RENDER_TEMPLATE_PATTERN, '') }
-      add_filter   { |line| line.sub('./', '/') } # for tests
+      @root = "#{Rails.root}/".freeze
+      add_filter { |line| line.sub(@root, EMPTY_STRING) }
+      add_filter { |line| line.sub(RENDER_TEMPLATE_PATTERN, EMPTY_STRING) }
+      add_filter { |line| line.sub(DOT_SLASH, SLASH) } # for tests
 
       add_gem_filters
       add_silencer { |line| line !~ APP_DIRS_PATTERN }
@@ -21,7 +25,8 @@ module Rails
         return if gems_paths.empty?
 
         gems_regexp = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w.]+)/(.*)}
-        add_filter { |line| line.sub(gems_regexp, '\2 (\3) \4') }
+        gems_result = '\2 (\3) \4'.freeze
+        add_filter { |line| line.sub(gems_regexp, gems_result) }
       end
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 2567469c95..38d9c4ef7c 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -12,6 +12,8 @@ source 'https://rubygems.org'
 <% end -%>
 <% end -%>
 
+gem 'rails-dom-testing', github: 'rails/rails-dom-testing'
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
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 466b74bd12..566b61ca66 100644
--- a/railties/lib/rails/generators/test_unit/job/job_generator.rb
+++ b/railties/lib/rails/generators/test_unit/job/job_generator.rb
@@ -6,7 +6,7 @@ module TestUnit # :nodoc:
       check_class_collision suffix: 'JobTest'
 
       def create_test_file
-        template 'unit_test.rb.erb', File.join('test/jobs', class_path, "#{file_name}_test.rb")
+        template 'unit_test.rb.erb', File.join('test/jobs', class_path, "#{file_name}_job_test.rb")
       end
     end
   end