3 files changed, 26 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb
index 9c97700e5d..186c863f91 100644
--- a/activesupport/test/core_ext/file_test.rb
+++ b/activesupport/test/core_ext/file_test.rb
@@ -59,6 +59,20 @@ class AtomicWriteTest < ActiveSupport::TestCase
     File.unlink(file_name) rescue nil
   end
 
+  def test_atomic_write_preserves_file_permissions_same_directory
+    Dir.mktmpdir do |temp_dir|
+      File.chmod 0700, temp_dir
+
+      probed_permissions = File.probe_stat_in(temp_dir).mode.to_s(8)
+
+      File.atomic_write(File.join(temp_dir, file_name), &:close)
+
+      actual_permissions = File.stat(File.join(temp_dir, file_name)).mode.to_s(8)
+
+      assert_equal actual_permissions, probed_permissions
+    end
+  end
+
   def test_atomic_write_returns_result_from_yielded_block
     block_return_value = File.atomic_write(file_name, Dir.pwd) do |file|
       "Hello world!"
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 9f2755a25c..b1b3070891 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -284,7 +284,7 @@ class DependenciesTest < ActiveSupport::TestCase
 
   def test_module_with_nested_class_requiring_lib_class
     with_autoloading_fixtures do
-      ModuleFolder::NestedWithRequire
+      _ = ModuleFolder::NestedWithRequire # assignment to silence parse-time warning "possibly useless use of :: in void context"
 
       assert defined?(ModuleFolder::LibClass)
       assert_not ActiveSupport::Dependencies.autoloaded_constants.include?("ModuleFolder::LibClass")
@@ -297,7 +297,7 @@ class DependenciesTest < ActiveSupport::TestCase
 
   def test_module_with_nested_class_and_parent_requiring_lib_class
     with_autoloading_fixtures do
-      NestedWithRequireParent
+      _ = NestedWithRequireParent # assignment to silence parse-time warning "possibly useless use of a constant in void context"
 
       assert defined?(ModuleFolder::LibClass)
       assert_not ActiveSupport::Dependencies.autoloaded_constants.include?("ModuleFolder::LibClass")
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index f87099566b..5f4e3f3fd3 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -772,6 +772,16 @@ class MultibyteCharsExtrasTest < ActiveSupport::TestCase
     assert_deprecated { ActiveSupport::Multibyte::Unicode.swapcase("") }
   end
 
+  def test_normalize_non_unicode_string
+    # Fullwidth Latin Capital Letter A in Windows 31J
+    str = "\u{ff21}".encode(Encoding::Windows_31J)
+    assert_raise Encoding::CompatibilityError do
+      ActiveSupport::Deprecation.silence do
+        ActiveSupport::Multibyte::Unicode.normalize(str)
+      end
+    end
+  end
+
   private
 
     def string_from_classes(classes)