railties 6.1.6 → 7.1.2

data/lib/rails/test_help.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :enddoc:
+
 # Make double-sure the RAILS_ENV is not set to production,
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
@@ -12,38 +14,35 @@ require "rails/generators/test_case"
 
 require "active_support/testing/autorun"
 
-if defined?(ActiveRecord::Base)
-  begin
-    ActiveRecord::Migration.maintain_test_schema!
-  rescue ActiveRecord::PendingMigrationError => e
-    puts e.to_s.strip
-    exit 1
-  end
+require "rails/testing/maintain_test_schema"
 
+if defined?(ActiveRecord::Base)
   ActiveSupport.on_load(:active_support_test_case) do
     include ActiveRecord::TestDatabases
     include ActiveRecord::TestFixtures
 
-    self.fixture_path = "#{Rails.root}/test/fixtures/"
-    self.file_fixture_path = fixture_path + "files"
+    self.fixture_paths << "#{Rails.root}/test/fixtures/"
+    self.file_fixture_path = "#{Rails.root}/test/fixtures/files"
   end
 
   ActiveSupport.on_load(:action_dispatch_integration_test) do
-    self.fixture_path = ActiveSupport::TestCase.fixture_path
+    self.fixture_paths += ActiveSupport::TestCase.fixture_paths
+  end
+else
+  ActiveSupport.on_load(:active_support_test_case) do
+    self.file_fixture_path = "#{Rails.root}/test/fixtures/files"
   end
 end
 
-# :enddoc:
-
 ActiveSupport.on_load(:action_controller_test_case) do
-  def before_setup # :nodoc:
+  def before_setup
     @routes = Rails.application.routes
     super
   end
 end
 
 ActiveSupport.on_load(:action_dispatch_integration_test) do
-  def before_setup # :nodoc:
+  def before_setup
     @routes = Rails.application.routes
     super
   end

data/lib/rails/test_unit/line_filtering.rb

@@ -5,7 +5,7 @@ require "rails/test_unit/runner"
 module Rails
   module LineFiltering # :nodoc:
     def run(reporter, options = {})
-      options[:filter] = Rails::TestUnit::Runner.compose_filter(self, options[:filter])
+      options = options.merge(filter: Rails::TestUnit::Runner.compose_filter(self, options[:filter]))
 
       super
     end

data/lib/rails/test_unit/railtie.rb

@@ -2,10 +2,6 @@
 
 require "rails/test_unit/line_filtering"
 
-if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
-  ENV["RAILS_ENV"] ||= Rake.application.options.show_tasks ? "development" : "test"
-end
-
 module Rails
   class TestUnitRailtie < Rails::Railtie
     config.app_generators do |c|

data/lib/rails/test_unit/reporter.rb

@@ -6,7 +6,7 @@ require "minitest"
 module Rails
   class TestUnitReporter < Minitest::StatisticsReporter
     class_attribute :app_root
-    class_attribute :executable, default: "rails test"
+    class_attribute :executable, default: "bin/rails test"
 
     def record(result)
       super
@@ -52,7 +52,11 @@ module Rails
     end
 
     def relative_path_for(file)
-      file.sub(/^#{app_root}\/?/, "")
+      if app_root
+        file.sub(/^#{app_root}\/?/, "")
+      else
+        file
+      end
     end
 
     private

data/lib/rails/test_unit/runner.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 require "shellwords"
-require "method_source"
 require "rake/file_list"
+require "active_support"
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/range"
+require "rails/test_unit/test_parser"
 
 module Rails
   module TestUnit
     class Runner
+      TEST_FOLDERS = [:models, :helpers, :channels, :controllers, :mailers, :integration, :jobs, :mailboxes]
+      PATH_ARGUMENT_PATTERN = %r"^(?!/.+/$)[.\w]*[/\\]"
       mattr_reader :filters, default: []
 
       class << self
@@ -29,10 +33,10 @@ module Rails
           $VERBOSE = argv.delete_at(w_index) if w_index
         end
 
-        def rake_run(argv = [])
-          ARGV.replace Shellwords.split(ENV["TESTOPTS"] || "")
-
-          run(argv)
+        def run_from_rake(test_command, argv = [])
+          # Ensure the tests run during the Rake Task action, not when the process exits
+          success = system("rails", test_command, *argv, *Shellwords.split(ENV["TESTOPTS"] || ""))
+          success || exit(false)
         end
 
         def run(argv = [])
@@ -43,14 +47,13 @@ module Rails
 
         def load_tests(argv)
           patterns = extract_filters(argv)
-
-          tests = Rake::FileList[patterns.any? ? patterns : default_test_glob]
-          tests.exclude(default_test_exclude_glob) if patterns.empty?
-
+          tests = list_tests(patterns)
           tests.to_a.each { |path| require File.expand_path(path) }
         end
 
         def compose_filter(runnable, filter)
+          filter = normalize_declarative_test_filter(filter)
+
           if filters.any? { |_, lines| lines.any? }
             CompositeFilter.new(runnable, filter, filters)
           else
@@ -61,10 +64,12 @@ module Rails
         private
           def extract_filters(argv)
             # Extract absolute and relative paths but skip -n /.*/ regexp filters.
-            argv.select { |arg| path_argument?(arg) && !regexp_filter?(arg) }.map do |path|
+            argv.filter_map do |path|
+              next unless path_argument?(path)
+
               path = path.tr("\\", "/")
               case
-              when /(:\d+)+$/.match?(path)
+              when /(:\d+(-\d+)?)+$/.match?(path)
                 file, *lines = path.split(":")
                 filters << [ file, lines ]
                 file
@@ -90,7 +95,26 @@ module Rails
           end
 
           def path_argument?(arg)
-            %r"^[/\\]?\w+[/\\]".match?(arg)
+            PATH_ARGUMENT_PATTERN.match?(arg)
+          end
+
+          def list_tests(patterns)
+            tests = Rake::FileList[patterns.any? ? patterns : default_test_glob]
+            tests.exclude(default_test_exclude_glob) if patterns.empty?
+            tests
+          end
+
+          def normalize_declarative_test_filter(filter)
+            if filter.is_a?(String)
+              if regexp_filter?(filter)
+                # Minitest::Spec::DSL#it does not replace whitespace in method
+                # names, so match unmodified method names as well.
+                filter = filter.gsub(/\s+/, "_").delete_suffix("/") + "|" + filter.delete_prefix("/")
+              elsif !filter.start_with?("test_")
+                filter = "test_#{filter.gsub(/\s+/, "_")}"
+              end
+            end
+            filter
           end
       end
     end
@@ -132,17 +156,21 @@ module Rails
     end
 
     class Filter # :nodoc:
-      def initialize(runnable, file, line)
+      def initialize(runnable, file, line_or_range)
         @runnable, @file = runnable, File.expand_path(file)
-        @line = line.to_i if line
+        if line_or_range
+          first, last = line_or_range.split("-").map(&:to_i)
+          last ||= first
+          @line_range = Range.new(first, last)
+        end
       end
 
       def ===(method)
         return unless @runnable.method_defined?(method)
 
-        if @line
+        if @line_range
           test_file, test_range = definition_for(@runnable.instance_method(method))
-          test_file == @file && test_range.include?(@line)
+          test_file == @file && @line_range.overlaps?(test_range)
         else
           @runnable.instance_method(method).source_location.first == @file
         end
@@ -150,10 +178,7 @@ module Rails
 
       private
         def definition_for(method)
-          file, start_line = method.source_location
-          end_line = method.source.count("\n") + start_line - 1
-
-          return file, start_line..end_line
+          TestParser.definition_for(method)
         end
     end
   end

data/lib/rails/test_unit/test_parser.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "ripper"
+
+module Rails
+  module TestUnit
+    # Parse a test file to extract the line ranges of all tests in both
+    # method-style (def test_foo) and declarative-style (test "foo" do)
+    class TestParser < Ripper # :nodoc:
+      # Helper to translate a method object into the path and line range where
+      # the method was defined.
+      def self.definition_for(method_obj)
+        path, begin_line = method_obj.source_location
+        begins_to_ends = new(File.read(path), path).parse
+        return unless end_line = begins_to_ends[begin_line]
+        [path, (begin_line..end_line)]
+      end
+
+      def initialize(*)
+        # A hash mapping the 1-indexed line numbers that tests start on to where they end.
+        @begins_to_ends = {}
+        super
+      end
+
+      def parse
+        super
+        @begins_to_ends
+      end
+
+      # method test e.g. `def test_some_description`
+      # This event's first argument gets the `ident` node containing the method
+      # name, which we have overridden to return the line number of the ident
+      # instead.
+      def on_def(begin_line, *)
+        @begins_to_ends[begin_line] = lineno
+      end
+
+      # Everything past this point is to support declarative tests, which
+      # require more work to get right because of the many different ways
+      # methods can be invoked in ruby, all of which are parsed differently.
+      #
+      # The approach is just to store the current line number when the
+      # "test" method is called and pass it up the tree so it's available at
+      # the point when we also know the line where the associated block ends.
+
+      def on_method_add_block(begin_line, end_line)
+        if begin_line && end_line
+          @begins_to_ends[begin_line] = end_line
+        end
+      end
+
+      def on_command_call(*, begin_lineno, _args)
+        begin_lineno
+      end
+
+      def first_arg(arg, *)
+        arg
+      end
+
+      def just_lineno(*)
+        lineno
+      end
+
+      alias on_method_add_arg first_arg
+      alias on_command first_arg
+      alias on_stmts_add first_arg
+      alias on_arg_paren first_arg
+      alias on_bodystmt first_arg
+
+      alias on_ident just_lineno
+      alias on_do_block just_lineno
+      alias on_stmts_new just_lineno
+      alias on_brace_block just_lineno
+
+      def on_args_new
+        []
+      end
+
+      def on_args_add(parts, part)
+        parts << part
+      end
+
+      def on_args_add_block(args, *rest)
+        args.first
+      end
+    end
+  end
+end

data/lib/rails/test_unit/testing.rake

@@ -1,20 +1,13 @@
 # frozen_string_literal: true
 
-gem "minitest"
 require "minitest"
 require "rails/test_unit/runner"
 
 task default: :test
 
-desc "Runs all tests in test folder except system ones"
+desc "Run all tests in test folder except system ones"
 task :test do
-  $: << "test"
-
-  if ENV.key?("TEST")
-    Rails::TestUnit::Runner.rake_run([ENV["TEST"]])
-  else
-    Rails::TestUnit::Runner.rake_run
-  end
+  Rails::TestUnit::Runner.run_from_rake("test", Array(ENV["TEST"]))
 end
 
 namespace :test do
@@ -25,40 +18,22 @@ namespace :test do
 
   task run: %w[test]
 
-  desc "Run tests quickly, but also reset db"
-  task db: %w[db:test:prepare test]
-
-  ["models", "helpers", "channels", "controllers", "mailers", "integration", "jobs", "mailboxes"].each do |name|
-    task name => "test:prepare" do
-      $: << "test"
-      Rails::TestUnit::Runner.rake_run(["test/#{name}"])
+  desc "Reset the database and run `bin/rails test`"
+  task :db do
+    success = system({ "RAILS_ENV" => ENV.fetch("RAILS_ENV", "test") }, "rake", "db:test:prepare", "test")
+    success || exit(false)
+  end
+
+  [
+    *Rails::TestUnit::Runner::TEST_FOLDERS,
+    :all,
+    :generators,
+    :units,
+    :functionals,
+    :system,
+  ].each do |name|
+    task name do
+      Rails::TestUnit::Runner.run_from_rake("test:#{name}")
     end
   end
-
-  desc "Runs all tests, including system tests"
-  task all: "test:prepare" do
-    $: << "test"
-    Rails::TestUnit::Runner.rake_run(["test/**/*_test.rb"])
-  end
-
-  task generators: "test:prepare" do
-    $: << "test"
-    Rails::TestUnit::Runner.rake_run(["test/lib/generators"])
-  end
-
-  task units: "test:prepare" do
-    $: << "test"
-    Rails::TestUnit::Runner.rake_run(["test/models", "test/helpers", "test/unit"])
-  end
-
-  task functionals: "test:prepare" do
-    $: << "test"
-    Rails::TestUnit::Runner.rake_run(["test/controllers", "test/mailers", "test/functional"])
-  end
-
-  desc "Run system tests only"
-  task system: "test:prepare" do
-    $: << "test"
-    Rails::TestUnit::Runner.rake_run(["test/system"])
-  end
 end

data/lib/rails/testing/maintain_test_schema.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+if defined?(ActiveRecord::Base)
+  begin
+    ActiveRecord::Migration.maintain_test_schema!
+  rescue ActiveRecord::PendingMigrationError => e
+    puts e.to_s.strip
+    exit 1
+  end
+
+  if Rails.configuration.eager_load
+    ActiveRecord::Base.descendants.each do |model|
+      model.load_schema if !model.abstract_class? && model.table_exists?
+    end
+  end
+end

data/lib/rails/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module Rails
-  # Returns the version of the currently loaded Rails as a string.
+  # Returns the currently loaded version of \Rails as a string.
   def self.version
     VERSION::STRING
   end

data/lib/rails/welcome_controller.rb

@@ -3,6 +3,7 @@
 require "rails/application_controller"
 
 class Rails::WelcomeController < Rails::ApplicationController # :nodoc:
+  skip_forgery_protection
   layout false
 
   def index

data/lib/rails/zeitwerk_checker.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# The actual (private) implementation of the Rake task zeitwerk:check.
+class Rails::ZeitwerkChecker # :nodoc:
+  def self.check
+    Zeitwerk::Loader.eager_load_all
+
+    autoloaded = ActiveSupport::Dependencies.autoload_paths + ActiveSupport::Dependencies.autoload_once_paths
+    eager_loaded = ActiveSupport::Dependencies._eager_load_paths.to_a
+
+    unchecked = autoloaded - eager_loaded
+    unchecked.select! { |dir| Dir.exist?(dir) && !Dir.empty?(dir)  }
+    unchecked
+  end
+end

data/lib/rails.rb

@@ -10,9 +10,10 @@ require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/object/blank"
 
-require "rails/application"
 require "rails/version"
-require "rails/autoloaders"
+require "rails/deprecator"
+require "rails/application"
+require "rails/backtrace_cleaner"
 
 require "active_support/railtie"
 require "action_dispatch/railtie"
@@ -23,9 +24,12 @@ silence_warnings do
   Encoding.default_internal = Encoding::UTF_8
 end
 
+# :include: railties/README.rdoc
 module Rails
   extend ActiveSupport::Autoload
+  extend ActiveSupport::Benchmarkable
 
+  autoload :HealthController
   autoload :Info
   autoload :InfoController
   autoload :MailersController
@@ -42,20 +46,16 @@ module Rails
 
     delegate :initialize!, :initialized?, to: :application
 
-    # The Configuration instance used to configure the Rails environment
+    # The Configuration instance used to configure the \Rails environment
     def configuration
       application.config
     end
 
     def backtrace_cleaner
-      @backtrace_cleaner ||= begin
-        # Relies on Active Support, so we have to lazy load to postpone definition until Active Support has been loaded
-        require "rails/backtrace_cleaner"
-        Rails::BacktraceCleaner.new
-      end
+      @backtrace_cleaner ||= Rails::BacktraceCleaner.new
     end
 
-    # Returns a Pathname object of the current Rails project,
+    # Returns a Pathname object of the current \Rails project,
     # otherwise it returns +nil+ if there is no project:
     #
     #   Rails.root
@@ -64,7 +64,7 @@ module Rails
       application && application.config.root
     end
 
-    # Returns the current Rails environment.
+    # Returns the current \Rails environment.
     #
     #   Rails.env # => "development"
     #   Rails.env.development? # => true
@@ -73,16 +73,27 @@ module Rails
       @_env ||= ActiveSupport::EnvironmentInquirer.new(ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "development")
     end
 
-    # Sets the Rails environment.
+    # Sets the \Rails environment.
     #
     #   Rails.env = "staging" # => "staging"
     def env=(environment)
       @_env = ActiveSupport::EnvironmentInquirer.new(environment)
     end
 
-    # Returns all Rails groups for loading based on:
+    # Returns the ActiveSupport::ErrorReporter of the current \Rails project,
+    # otherwise it returns +nil+ if there is no project.
+    #
+    #   Rails.error.handle(IOError) do
+    #     # ...
+    #   end
+    #   Rails.error.report(error)
+    def error
+      ActiveSupport.error_reporter
+    end
+
+    # Returns all \Rails groups for loading based on:
     #
-    # * The Rails environment;
+    # * The \Rails environment;
     # * The environment variable RAILS_GROUPS;
     # * The optional envs given as argument and the hash with group dependencies;
     #
@@ -101,7 +112,7 @@ module Rails
     end
 
     # Returns a Pathname object of the public folder of the current
-    # Rails project, otherwise it returns +nil+ if there is no project:
+    # \Rails project, otherwise it returns +nil+ if there is no project:
     #
     #   Rails.public_path
     #     # => #<Pathname:/Users/someuser/some/path/project/public>
@@ -110,7 +121,7 @@ module Rails
     end
 
     def autoloaders
-      Autoloaders
+      application.autoloaders
     end
   end
 end