Merge branch 'main' into activestorage-variant-nplusone

Author: ghiculescu

Gemfile.lock

@@ -901,7 +901,7 @@ def self.supports_path? # :doc:
       end
 
       def apply_defaults(headers)
-        default_values = self.class.default.transform_values do |value|
+        default_values = self.class.default.except(*headers.keys).transform_values do |value|
           compute_default(value)
         end
 

actionmailer/lib/action_mailer/base.rb

@@ -833,6 +833,14 @@ def self.previewing_email(mail); end
     assert_equal("Thanks for signing up this afternoon", mail.subject)
   end
 
+  test "proc default values are not evaluated when overridden" do
+    with_default BaseMailer, from: -> { flunk }, to: -> { flunk } do
+      email = BaseMailer.welcome(from: "[email protected]", to: "[email protected]")
+      assert_equal ["[email protected]"], email.from
+      assert_equal ["[email protected]"], email.to
+    end
+  end
+
   test "modifying the mail message with a before_action" do
     class BeforeActionMailer < ActionMailer::Base
       before_action :add_special_header!

actionmailer/test/base_test.rb

@@ -137,11 +137,8 @@ def try_precompressed_files(filepath, headers, accept_encoding:)
       end
 
       def file_readable?(path)
-        file_stat = File.stat(File.join(@root, path.b))
-      rescue SystemCallError
-        false
-      else
-        file_stat.file? && file_stat.readable?
+        file_path = File.join(@root, path.b)
+        File.file?(file_path) && File.readable?(file_path)
       end
 
       def compressible?(content_type)

actionpack/lib/action_dispatch/middleware/static.rb

@@ -6,6 +6,7 @@
 <%= @exception.message %>
 <% if defined?(ActiveStorage) && @exception.message.match?(%r{#{ActiveStorage::Blob.table_name}|#{ActiveStorage::Attachment.table_name}}) %>
 To resolve this issue run: bin/rails active_storage:install
+<% end %>
 <% if defined?(ActionMailbox) && @exception.message.match?(%r{#{ActionMailbox::InboundEmail.table_name}}) %>
 To resolve this issue run: bin/rails action_mailbox:install
 <% end %>

actionpack/lib/action_dispatch/middleware/templates/rescues/invalid_statement.text.erb

@@ -40,10 +40,7 @@ def take_screenshot
         # Takes a screenshot of the current page in the browser if the test
         # failed.
         #
-        # +take_failed_screenshot+ is included in <tt>application_system_test_case.rb</tt>
-        # that is generated with the application. To take screenshots when a test
-        # fails add +take_failed_screenshot+ to the teardown block before clearing
-        # sessions.
+        # +take_failed_screenshot+ is called during system test teardown.
         def take_failed_screenshot
           take_screenshot if failed? && supports_screenshot?
         end

actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb

@@ -9,7 +9,6 @@ class TestControllerWithExtraEtags < ActionController::Base
     "test/hello_world.erb" => "Hello world!"
   )]
 
-  def self.controller_name; "test"; end
   def self.controller_path; "test"; end
 
   etag { nil  }

actionpack/test/controller/render_test.rb

@@ -4,7 +4,7 @@ module ActionView
   module Helpers #:nodoc:
     module JavaScriptHelper
       JS_ESCAPE_MAP = {
-        '\\'    => '\\\\',
+        "\\"    => "\\\\",
         "</"    => '<\/',
         "\r\n"  => '\n',
         "\n"    => '\n',

actionview/lib/action_view/helpers/javascript_helper.rb

@@ -16,6 +16,9 @@ class ERB
         # Do not escape templates of these mime types.
         class_attribute :escape_ignore_list, default: ["text/plain"]
 
+        # Strip trailing newlines from rendered output
+        class_attribute :strip_trailing_newlines, default: false
+
         ENCODING_TAG = Regexp.new("\\A(<%#{ENCODING_FLAG}-?%>)[ \\t]*")
 
         def self.call(template, source)
@@ -45,6 +48,9 @@ def call(template, source)
           # Always make sure we return a String in the default_internal
           erb.encode!
 
+          # Strip trailing newlines from the template if enabled
+          erb.chomp! if strip_trailing_newlines
+
           options = {
             escape: (self.class.escape_ignore_list.include? template.type),
             trim: (self.class.erb_trim_mode == "-")

actionview/lib/action_view/template/handlers/erb.rb

@@ -24,6 +24,10 @@ def controller_path=(path)
         self.class.controller_path = path
       end
 
+      def self.controller_name
+        "test"
+      end
+
       def initialize
         super
         self.class.controller_path = ""