railties 6.1.0 → 7.0.0

data/lib/rails/generators/rails/app/templates/config/locales/en.yml

@@ -4,11 +4,11 @@
 #
 # To use the locales, use `I18n.t`:
 #
-#     I18n.t 'hello'
+#     I18n.t "hello"
 #
 # In views, this is aliased to just `t`:
 #
-#     <%= t('hello') %>
+#     <%= t("hello") %>
 #
 # To use a different locale, set it with `I18n.locale`:
 #
@@ -24,7 +24,7 @@
 # Instead, surround them with single quotes.
 #
 # en:
-#   'true': 'foo'
+#   "true": "foo"
 #
 # To learn more, please read the Rails Internationalization guide
 # available at https://guides.rubyonrails.org/i18n.html.

data/lib/rails/generators/rails/app/templates/config/puma.rb.tt

@@ -39,5 +39,5 @@ pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
 #
 # preload_app!
 
-# Allow puma to be restarted by `rails restart` command.
+# Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart

data/lib/rails/generators/rails/app/templates/config/routes.rb.tt

@@ -1,3 +1,6 @@
 Rails.application.routes.draw do
-  # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
+  # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
+
+  # Defines the root path route ("/")
+  # root "articles#index"
 end

data/lib/rails/generators/rails/app/templates/config/storage.yml.tt

@@ -6,27 +6,27 @@ local:
   service: Disk
   root: <%%= Rails.root.join("storage") %>
 
-# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
 # amazon:
 #   service: S3
 #   access_key_id: <%%= Rails.application.credentials.dig(:aws, :access_key_id) %>
 #   secret_access_key: <%%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
 #   region: us-east-1
-#   bucket: your_own_bucket
+#   bucket: your_own_bucket-<%%= Rails.env %>
 
 # Remember not to checkin your GCS keyfile to a repository
 # google:
 #   service: GCS
 #   project: your_project
 #   credentials: <%%= Rails.root.join("path/to/gcs.keyfile") %>
-#   bucket: your_own_bucket
+#   bucket: your_own_bucket-<%%= Rails.env %>
 
-# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
 # microsoft:
 #   service: AzureStorage
 #   storage_account_name: your_account_name
 #   storage_access_key: <%%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
-#   container: your_container_name
+#   container: your_container_name-<%%= Rails.env %>
 
 # mirror:
 #   service: Mirror

data/lib/rails/generators/rails/app/templates/db/seeds.rb.tt

@@ -3,5 +3,5 @@
 #
 # Examples:
 #
-#   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
-#   Character.create(name: 'Luke', movie: movies.first)
+#   movies = Movie.create([{ name: "Star Wars" }, { name: "Lord of the Rings" }])
+#   Character.create(name: "Luke", movie: movies.first)

data/lib/rails/generators/rails/app/templates/gitattributes.tt

@@ -5,10 +5,5 @@
 db/schema.rb linguist-generated
 <% end -%>
 
-<% unless options[:skip_javascript] -%>
-# Mark the yarn lockfile as having been generated.
-yarn.lock linguist-generated
-<% end -%>
-
 # Mark any vendored files as having been vendored.
 vendor/* linguist-vendored

data/lib/rails/generators/rails/app/templates/gitignore.tt

@@ -31,10 +31,12 @@
 /storage/*
 <% if keeps? -%>
 !/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
 <% end -%>
 <% end -%>
 <% unless options.api? -%>
 
 /public/assets
 <% end -%>
-.byebug_history

data/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt

@@ -1,4 +1,4 @@
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 require_relative "../config/environment"
 require "rails/test_help"
 

data/lib/rails/generators/rails/controller/controller_generator.rb

@@ -6,7 +6,6 @@ module Rails
       argument :actions, type: :array, default: [], banner: "action action"
       class_option :skip_routes, type: :boolean, desc: "Don't add routes to config/routes.rb."
       class_option :helper, type: :boolean
-      class_option :assets, type: :boolean
 
       check_class_collision suffix: "Controller"
 
@@ -21,7 +20,7 @@ module Rails
         route routing_code, namespace: regular_class_path
       end
 
-      hook_for :template_engine, :test_framework, :helper, :assets do |generator|
+      hook_for :template_engine, :test_framework, :helper do |generator|
         invoke generator, [ remove_possible_suffix(name), actions ]
       end
 

data/lib/rails/generators/rails/controller/templates/controller.rb.tt

@@ -1,7 +1,3 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_path %>/application_controller"
-
-<% end -%>
 <% module_namespacing do -%>
 class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>

data/lib/rails/generators/rails/db/system/change/change_generator.rb

@@ -55,7 +55,7 @@ module Rails
             end
 
             def gem_entry_for(*gem_name_and_version)
-              gem_name_and_version.map! { |segment| "'#{segment}'" }
+              gem_name_and_version.map! { |segment| "\"#{segment}\"" }
               "gem #{gem_name_and_version.join(", ")}"
             end
         end

data/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt

@@ -1,3 +1,3 @@
 class <%= class_name %>Generator < Rails::Generators::NamedBase
-  source_root File.expand_path('templates', __dir__)
+  source_root File.expand_path("templates", __dir__)
 end

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -26,11 +26,15 @@ module Rails
           empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
         end
 
+        empty_directory_with_keep_file "app/models/concerns"
+        empty_directory_with_keep_file "app/controllers/concerns"
         remove_dir "app/mailers" if options[:skip_action_mailer]
         remove_dir "app/jobs" if options[:skip_active_job]
       elsif full?
         empty_directory_with_keep_file "app/models"
         empty_directory_with_keep_file "app/controllers"
+        empty_directory_with_keep_file "app/models/concerns"
+        empty_directory_with_keep_file "app/controllers/concerns"
         empty_directory_with_keep_file "app/mailers" unless options[:skip_action_mailer]
         empty_directory_with_keep_file "app/jobs" unless options[:skip_active_job]
 
@@ -51,7 +55,7 @@ module Rails
     end
 
     def license
-      template "MIT-LICENSE"
+      template "MIT-LICENSE" unless inside_application?
     end
 
     def gemspec
@@ -65,6 +69,9 @@ module Rails
     def version_control
       if !options[:skip_git] && !options[:pretend]
         run "git init", capture: options[:quiet], abort_on_failure: false
+        if user_default_branch.strip.empty?
+          `git symbolic-ref HEAD refs/heads/main`
+        end
       end
     end
 
@@ -87,12 +94,18 @@ module Rails
     def test
       template "test/test_helper.rb"
       template "test/%namespaced_name%_test.rb"
-      append_file "Rakefile", <<-EOF
 
-#{rakefile_test_tasks}
-task default: :test
-      EOF
       if engine?
+        empty_directory_with_keep_file "test/fixtures/files"
+        empty_directory_with_keep_file "test/controllers"
+        empty_directory_with_keep_file "test/mailers"
+        empty_directory_with_keep_file "test/models"
+        empty_directory_with_keep_file "test/integration"
+
+        unless api?
+          empty_directory_with_keep_file "test/helpers"
+        end
+
         template "test/integration/navigation_test.rb"
       end
     end
@@ -103,10 +116,8 @@ task default: :test
       opts = options.transform_keys(&:to_sym).except(*DUMMY_IGNORE_OPTIONS)
       opts[:force] = force
       opts[:skip_bundle] = true
-      opts[:skip_listen] = true
       opts[:skip_git] = true
-      opts[:skip_turbolinks] = true
-      opts[:skip_webpack_install] = true
+      opts[:skip_hotwire] = true
       opts[:dummy_app] = true
 
       invoke Rails::Generators::AppGenerator,
@@ -123,10 +134,16 @@ task default: :test
       if mountable?
         template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       end
+      if engine? && !api?
+        insert_into_file "#{dummy_path}/config/application.rb", indent(<<~RUBY, 4), after: /^\s*config\.load_defaults.*\n/
+
+          # For compatibility with applications that use this config
+          config.action_controller.include_all_helpers = false
+        RUBY
+      end
     end
 
-    def test_dummy_assets
-      template "rails/javascripts.js",    "#{dummy_path}/app/javascript/packs/application.js", force: true
+    def test_dummy_sprocket_assets
       template "rails/stylesheets.css",   "#{dummy_path}/app/assets/stylesheets/application.css", force: true
       template "rails/dummy_manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
     end
@@ -174,6 +191,11 @@ task default: :test
         append_file gemfile_in_app_path, entry
       end
     end
+
+    private
+      def user_default_branch
+        @user_default_branch ||= `git config init.defaultbranch`
+      end
   end
 
   module Generators
@@ -209,13 +231,17 @@ task default: :test
       public_task :set_default_accessors!
       public_task :create_root
 
+      def target_rails_prerelease
+        super("plugin new")
+      end
+
       def create_root_files
         build(:readme)
         build(:rakefile)
         build(:gemspec)   unless options[:skip_gemspec]
         build(:license)
         build(:gitignore) unless options[:skip_git]
-        build(:gemfile)   unless options[:skip_gemfile]
+        build(:gemfile)
         build(:version_control)
       end
 
@@ -290,7 +316,7 @@ task default: :test
         mute do
           build(:generate_test_dummy)
           build(:test_dummy_config)
-          build(:test_dummy_assets)
+          build(:test_dummy_sprocket_assets) unless skip_sprockets?
           build(:test_dummy_clean)
           # ensure that bin/rails has proper dummy_path
           build(:bin, true)
@@ -372,6 +398,10 @@ task default: :test
         end
       end
 
+      def rails_version_specifier(gem_version = Rails.gem_version)
+        [">= #{gem_version}"]
+      end
+
       def valid_const?
         if /-\d/.match?(original_name)
           raise Error, "Invalid plugin name #{original_name}. Please give a name which does not contain a namespace starting with numeric characters."
@@ -392,18 +422,6 @@ task default: :test
         defined?(::PluginBuilder) ? ::PluginBuilder : Rails::PluginBuilder
       end
 
-      def rakefile_test_tasks
-        <<-RUBY
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-        RUBY
-      end
-
       def dummy_path(path = nil)
         @dummy_path = path if path
         @dummy_path || options[:dummy_path]

data/lib/rails/generators/rails/plugin/templates/%name%.gemspec.tt

@@ -8,9 +8,11 @@ Gem::Specification.new do |spec|
   spec.homepage    = "TODO"
   spec.summary     = "TODO: Summary of <%= camelized_modules %>."
   spec.description = "TODO: Description of <%= camelized_modules %>."
+  <% unless inside_application? -%>
   spec.license     = "MIT"
+  <% end -%>
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the "allowed_push_host"
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -18,7 +20,9 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
   spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
-  spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  end
 
-  <%= '# ' if options.dev? || options.edge? || options.master? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
+  <%= "# " if rails_prerelease? -%>spec.add_dependency "rails", "<%= Array(rails_version_specifier).join('", "') %>"
 end

data/lib/rails/generators/rails/plugin/templates/Gemfile.tt

@@ -1,8 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 <% if options[:skip_gemspec] -%>
-<%= '# ' if options.dev? || options.edge? || options.master? -%>gem 'rails', '<%= Array(rails_version_specifier).join("', '") %>'
+<%= "# " if rails_prerelease? -%>gem "rails", "<%= Array(rails_version_specifier).join("', '") %>"
 <% else -%>
 # Specify your gem's dependencies in <%= name %>.gemspec.
 gemspec
@@ -10,32 +10,23 @@ gemspec
 <% unless options[:skip_active_record] -%>
 
 group :development do
-  gem '<%= gem_for_database[0] %>'
+  gem "<%= gem_for_database[0] %>"
 end
 <% end -%>
 
-<% if options.dev? || options.edge? -%>
-# Your gem is dependent on dev or edge Rails. Once you can lock this
+<% if rails_prerelease? -%>
+# Your gem is dependent on a prerelease version of Rails. Once you can lock this
 # dependency down to a specific version, move it to your gemspec.
-<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
-<% gemfile_entries.each do |gem| -%>
-<% if gem.comment -%>
-
-# <%= gem.comment %>
-<% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
-<% if gem.options.any? -%>
-, <%= gem.options.map { |k,v|
-  "#{k}: #{v.inspect}" }.join(', ') %>
-<% end -%>
+<% gemfile_entries.each do |gemfile_entry| -%>
+<%= gemfile_entry %>
 <% end -%>
 
 <% end -%>
-<% if RUBY_ENGINE == 'ruby' -%>
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
+<% if RUBY_ENGINE == "ruby" -%>
+# Start debugger with binding.b -- Read more: https://github.com/ruby/debug
+# gem "debug", ">= 1.0.0", group: %i[ development test ]
 <% end -%>
 <% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
 
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby]
 <% end -%>

data/lib/rails/generators/rails/plugin/templates/README.md.tt

@@ -8,7 +8,7 @@ How to use my plugin.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem '<%= name %>'
+gem "<%= name %>"
 ```
 
 And then execute:

data/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt

@@ -1,7 +1,7 @@
 <%= wrap_in_modules <<~rb
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt

@@ -6,9 +6,6 @@
   <%%= csp_meta_tag %>
 
   <%%= stylesheet_link_tag    "<%= namespaced_name %>/application", media: "all" %>
-  <%- unless options[:skip_javascript] -%>
-  <%%= javascript_include_tag "<%= namespaced_name %>/application" %>
-  <%- end -%>
 </head>
 <body>
 

data/lib/rails/generators/rails/plugin/templates/bin/rails.tt

@@ -1,14 +1,14 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/<%= namespaced_name -%>/engine', __dir__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/<%= namespaced_name -%>/engine", __dir__)
 <% if with_dummy_app? -%>
-APP_PATH = File.expand_path('../<%= dummy_path -%>/config/application', __dir__)
+APP_PATH = File.expand_path("../<%= dummy_path -%>/config/application", __dir__)
 <% end -%>
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 <% if include_all_railties? -%>
@@ -24,7 +24,6 @@ require "action_controller/railtie"
 <%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
 require "action_view/railtie"
 <%= comment_if :skip_action_cable %>require "action_cable/engine"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test %>require "rails/test_unit/railtie"
 <% end -%>
 require "rails/engine/commands"

data/lib/rails/generators/rails/plugin/templates/gitignore.tt

@@ -9,13 +9,8 @@
 /<%= dummy_path %>/db/*.sqlite3-*
 <% end -%>
 /<%= dummy_path %>/log/*.log
-<% unless options[:skip_javascript] -%>
-/<%= dummy_path %>/node_modules/
-/<%= dummy_path %>/yarn-error.log
-<% end -%>
 <% unless skip_active_storage? -%>
 /<%= dummy_path %>/storage/
 <% end -%>
 /<%= dummy_path %>/tmp/
 <% end -%>
-.byebug_history

data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb.tt

@@ -1,7 +1,7 @@
 <%= wrap_in_modules <<~rb
   class Engine < ::Rails::Engine
-  #{mountable? ? '  isolate_namespace ' + camelized_modules : ' '}
-  #{api? ? "  config.generators.api_only = true" : ' '}
+  #{mountable? ? "  isolate_namespace " + camelized_modules : " "}
+  #{api? ? "  config.generators.api_only = true" : " "}
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb.tt

@@ -1 +1 @@
-<%= wrap_in_modules "VERSION = '0.1.0'" %>
+<%= wrap_in_modules 'VERSION = "0.1.0"' %>

data/lib/rails/generators/rails/plugin/templates/rails/boot.rb.tt

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
 
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)
+$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)

data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb.tt

@@ -1,20 +1,15 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require_relative "<%= File.join('..', options[:dummy_path], 'config/environment') -%>"
+require_relative "<%= File.join("..", options[:dummy_path], "config/environment") -%>"
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../<%= options[:dummy_path] -%>/db/migrate", __dir__)]
 <% if options[:mountable] -%>
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
+ActiveRecord::Migrator.migrations_paths << File.expand_path("../db/migrate", __dir__)
 <% end -%>
 <% end -%>
 require "rails/test_help"
 
-<% unless engine? -%>
-require "rails/test_unit/reporter"
-Rails::TestUnitReporter.executable = 'bin/test'
-<% end -%>
-
 <% unless options[:skip_active_record] -%>
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -9,28 +9,9 @@ module Rails
       remove_class_option :actions
 
       class_option :api, type: :boolean
-      class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
-      class_option :stylesheet_engine, desc: "Engine for Stylesheets"
-      class_option :assets, type: :boolean
       class_option :resource_route, type: :boolean
-      class_option :scaffold_stylesheet, type: :boolean
-
-      def handle_skip
-        @options = @options.merge(stylesheets: false) unless options[:assets]
-        @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet]
-      end
 
       hook_for :scaffold_controller, required: true
-
-      hook_for :assets do |assets|
-        invoke assets, [controller_name]
-      end
-
-      hook_for :stylesheet_engine do |stylesheet_engine|
-        if behavior == :invoke
-          invoke stylesheet_engine, [controller_name]
-        end
-      end
     end
   end
 end

data/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt

@@ -1,10 +1,6 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_path %>/application_controller"
-
-<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+  before_action :set_<%= singular_table_name %>, only: %i[ show update destroy ]
 
   # GET <%= route_url %>
   def index

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt

@@ -1,10 +1,6 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_path %>/application_controller"
-
-<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+  before_action :set_<%= singular_table_name %>, only: %i[ show edit update destroy ]
 
   # GET <%= route_url %>
   def index
@@ -29,25 +25,25 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
     if @<%= orm_instance.save %>
-      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully created.") %>
     else
-      render :new
+      render :new, status: :unprocessable_entity
     end
   end
 
   # PATCH/PUT <%= route_url %>/1
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully updated.") %>
     else
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
   end
 
   # DELETE <%= route_url %>/1
   def destroy
     @<%= orm_instance.destroy %>
-    redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
+    redirect_to <%= index_helper %>_url, notice: <%= %("#{human_name} was successfully destroyed.") %>
   end
 
   private

data/lib/rails/generators/resource_helpers.rb

@@ -8,13 +8,13 @@ module Rails
     # Deal with controller names on scaffold and add some helpers to deal with
     # ActiveModel.
     module ResourceHelpers # :nodoc:
-      def self.included(base) #:nodoc:
+      def self.included(base) # :nodoc:
         base.include(Rails::Generators::ModelHelpers)
         base.class_option :model_name, type: :string, desc: "ModelName to be used"
       end
 
       # Set controller variables on initialization.
-      def initialize(*args) #:nodoc:
+      def initialize(*args) # :nodoc:
         super
         controller_name = name
         if options[:model_name]

data/lib/rails/generators/test_unit/generator/templates/generator_test.rb.tt

@@ -4,7 +4,7 @@ require "<%= generator_path %>"
 <% module_namespacing do -%>
 class <%= class_name %>GeneratorTest < Rails::Generators::TestCase
   tests <%= class_name %>Generator
-  destination Rails.root.join('tmp/generators')
+  destination Rails.root.join("tmp/generators")
   setup :prepare_destination
 
   # test "generator runs without errors" do

data/lib/rails/generators/test_unit/model/templates/fixtures.yml.tt

@@ -4,7 +4,7 @@
 <%= name %>:
 <% attributes.each do |attribute| -%>
   <%- if attribute.password_digest? -%>
-  password_digest: <%%= BCrypt::Password.create('secret') %>
+  password_digest: <%%= BCrypt::Password.create("secret") %>
   <%- elsif attribute.reference? -%>
   <%= yaml_key_value(attribute.column_name.delete_suffix("_id"), attribute.default || name) %>
   <%- elsif !attribute.virtual? -%>
@@ -18,7 +18,7 @@
 <% else -%>
 
 # This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
+# model remove the "{}" from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
 one: {}