Merge branch 'rails:main' into patch-1

Author: audiosupp

activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -345,6 +345,15 @@ def build_create_table_definition(table_name, id: :primary_key, primary_key: nil
       #   # Creates a table called 'assemblies_parts' with no id.
       #   create_join_table(:assemblies, :parts)
       #
+      #   # Creates a table called 'paper_boxes_papers' with no id.
+      #   create_join_table('papers', 'paper_boxes')
+      #
+      # A duplicate prefix is combined into a single prefix. This is useful for
+      # namespaced models like Music::Artist and Music::Record:
+      #
+      #   # Creates a table called 'music_artists_records' with no id.
+      #   create_join_table('music_artists', 'music_records')
+      #
       # You can pass an +options+ hash which can include the following keys:
       # [<tt>:table_name</tt>]
       #   Sets the table name, overriding the default.

railties/lib/rails/code_statistics.rb

@@ -43,12 +43,18 @@ class CodeStatistics
     HEADERS = { lines: " Lines", code_lines: "   LOC", classes: "Classes", methods: "Methods" }
 
     class_attribute :directories, default: DIRECTORIES
+    class_attribute :test_types, default: TEST_TYPES
 
     # Add directories to the output of the `bin/rails stats` command.
     #
     #   Rails::CodeStatistics.register_directory("My Directory", "path/to/dir")
-    def self.register_directory(label, path)
+    #
+    # For directories that contain test code, set the `test_directory` argument to true.
+    #
+    #   Rails::CodeStatistics.register_directory("Model specs", "spec/models", test_directory: true)
+    def self.register_directory(label, path, test_directory: false)
       self.directories << [label, path]
+      self.test_types << label
     end
 
     def initialize(*pairs)
@@ -99,13 +105,13 @@ def calculate_total
 
       def calculate_code
         code_loc = 0
-        @statistics.each { |k, v| code_loc += v.code_lines unless TEST_TYPES.include? k }
+        @statistics.each { |k, v| code_loc += v.code_lines unless test_types.include? k }
         code_loc
       end
 
       def calculate_tests
         test_loc = 0
-        @statistics.each { |k, v| test_loc += v.code_lines if TEST_TYPES.include? k }
+        @statistics.each { |k, v| test_loc += v.code_lines if test_types.include? k }
         test_loc
       end
 

railties/lib/rails/generators/rails/app/templates/bin/setup.tt

@@ -13,7 +13,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 <% if using_node? -%>
 
@@ -38,6 +37,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Starting development server =="
-  exec "bin/dev"
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end

railties/lib/rails/generators/rails/devcontainer/devcontainer_generator.rb

@@ -38,9 +38,11 @@ def create_devcontainer
 
       def update_application_system_test_case
         return unless options[:system_test]
-        return unless File.exist?("test/application_system_test_case.rb")
 
-        gsub_file("test/application_system_test_case.rb", /^\s*driven_by\b.*/, system_test_configuration)
+        system_test_case_path = File.expand_path "test/application_system_test_case.rb", destination_root
+        return unless File.exist? system_test_case_path
+
+        gsub_file(system_test_case_path, /^\s*driven_by\b.*/, system_test_configuration)
       end
 
       def update_database_yml

railties/lib/rails/generators/rails/devcontainer/templates/devcontainer/devcontainer.json.tt

@@ -33,5 +33,5 @@
 <%- end -%>
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bin/setup"
+  "postCreateCommand": "bin/setup --skip-server"
 }

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

@@ -43,7 +43,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # DELETE <%= route_url %>/1
   def destroy
     @<%= orm_instance.destroy %>
-    redirect_to <%= index_helper %>_url, notice: <%= %("#{human_name} was successfully destroyed.") %>, status: :see_other
+    redirect_to <%= index_helper %>_path, notice: <%= %("#{human_name} was successfully destroyed.") %>, status: :see_other
   end
 
   private

railties/test/application/bin_setup_test.rb

@@ -20,10 +20,9 @@ def test_bin_setup
         assert_equal 5, File.size("log/test.log")
         assert_not File.exist?("tmp/restart.txt")
 
-        `bin/setup 2>&1`
+        `bin/setup --skip-server 2>&1`
         assert_equal 0, File.size("log/test.log")
         assert_equal '["ar_internal_metadata", "articles", "schema_migrations"]', list_tables.call
-        assert File.exist?("tmp/restart.txt")
       end
     end
 
@@ -35,7 +34,7 @@ def test_bin_setup_output
 
         app_file "db/schema.rb", ""
 
-        output = `bin/setup 2>&1`
+        output = `bin/setup --skip-server 2>&1`
 
         # Ignore line that's only output by Bundler < 1.14
         output.sub!(/^Resolving dependencies\.\.\.\n/, "")
@@ -58,8 +57,6 @@ def test_bin_setup_output
           Created database 'app_test'
 
           == Removing old logs and tempfiles ==
-
-          == Restarting application server ==
         OUTPUT
       end
     end

railties/test/code_statistics_test.rb

@@ -14,6 +14,20 @@ def teardown
     FileUtils.rm_rf(@tmp_path)
   end
 
+  test "register directories" do
+    Rails::CodeStatistics.register_directory("My Directory", "path/to/dir")
+    assert Rails::CodeStatistics.directories.include?(["My Directory", "path/to/dir"])
+  ensure
+    Rails::CodeStatistics.directories.delete(["My Directory", "path/to/dir"])
+  end
+
+  test "register test directories" do
+    Rails::CodeStatistics.register_directory("Model specs", "spec/models", test_directory: true)
+    assert Rails::CodeStatistics.test_types.include?("Model specs")
+  ensure
+    Rails::CodeStatistics.test_types.delete("Model specs")
+  end
+
   test "ignores directories that happen to have source files extensions" do
     assert_nothing_raised do
       @code_statistics = Rails::CodeStatistics.new(["tmp dir", @tmp_path])

railties/test/fixtures/.devcontainer/devcontainer.json

@@ -27,5 +27,5 @@
   // "remoteUser": "root",
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bin/setup"
+  "postCreateCommand": "bin/setup --skip-server"
 }

railties/test/fixtures/test/application_system_test_case.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  driven_by :selenium, using: :headless_chrome, screen_size: [ 1400, 1400 ]
+end