From 355683444e5b1a31ba33ef543e8329ba21853d60 Mon Sep 17 00:00:00 2001
From: Paarth Madan <paarth.madan@shopify.com>
Date: Tue, 14 Dec 2021 13:48:33 -0500
Subject: [PATCH 1/3] Remove alias for assert_raise

---
 lib/i18n/tests/defaults.rb                  |  2 +-
 lib/i18n/tests/interpolation.rb             | 14 +++---
 lib/i18n/tests/localization/date.rb         |  6 +--
 lib/i18n/tests/localization/date_time.rb    |  2 +-
 lib/i18n/tests/localization/time.rb         |  2 +-
 lib/i18n/tests/lookup.rb                    |  4 +-
 lib/i18n/tests/pluralization.rb             |  2 +-
 test/backend/cache_test.rb                  |  8 ++--
 test/backend/cascade_test.rb                |  6 +--
 test/backend/fallbacks_test.rb              |  6 +--
 test/backend/interpolation_compiler_test.rb |  2 +-
 test/backend/key_value_test.rb              |  4 +-
 test/backend/simple_test.rb                 |  2 +-
 test/backend/transliterator_test.rb         |  4 +-
 test/i18n/exceptions_test.rb                |  2 +-
 test/i18n/interpolate_test.rb               |  6 +--
 test/i18n/load_path_test.rb                 |  4 +-
 test/i18n_test.rb                           | 48 ++++++++++-----------
 test/locale/fallbacks_test.rb               |  2 +-
 test/test_helper.rb                         |  1 -
 20 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/lib/i18n/tests/defaults.rb b/lib/i18n/tests/defaults.rb
index b46af61f..31fdb469 100644
--- a/lib/i18n/tests/defaults.rb
+++ b/lib/i18n/tests/defaults.rb
@@ -37,7 +37,7 @@ def setup
       end
 
       test "defaults: given an array of missing keys it raises a MissingTranslationData exception" do
-        assert_raise I18n::MissingTranslationData do
+        assert_raises I18n::MissingTranslationData do
           I18n.t(:does_not_exist, :default => [:does_not_exist_2, :does_not_exist_3], :raise => true)
         end
       end
diff --git a/lib/i18n/tests/interpolation.rb b/lib/i18n/tests/interpolation.rb
index fd78804a..6bfe2e03 100644
--- a/lib/i18n/tests/interpolation.rb
+++ b/lib/i18n/tests/interpolation.rb
@@ -41,7 +41,7 @@ module Interpolation
       end
 
       test "interpolation: given values but missing a key it raises I18n::MissingInterpolationArgument" do
-        assert_raise(I18n::MissingInterpolationArgument) do
+        assert_raises(I18n::MissingInterpolationArgument) do
           interpolate(:default => '%{foo}', :bar => 'bar')
         end
       end
@@ -77,13 +77,13 @@ module Interpolation
 
       if Object.const_defined?(:Encoding)
         test "interpolation: given a euc-jp translation and a utf-8 value it raises Encoding::CompatibilityError" do
-          assert_raise(Encoding::CompatibilityError) do
+          assert_raises(Encoding::CompatibilityError) do
             interpolate(:default => euc_jp('こんにちは、%{name}さん!'), :name => 'ゆきひろ')
           end
         end
 
         test "interpolation: given a utf-8 translation and a euc-jp value it raises Encoding::CompatibilityError" do
-          assert_raise(Encoding::CompatibilityError) do
+          assert_raises(Encoding::CompatibilityError) do
             interpolate(:default => 'こんにちは、%{name}さん!', :name => euc_jp('ゆきひろ'))
           end
         end
@@ -108,10 +108,10 @@ module Interpolation
       end
 
       test "interpolation: given a translations containing a reserved key it raises I18n::ReservedInterpolationKey" do
-        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{exception_handler}') }
-        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{default}') }
-        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{separator}') }
-        assert_raise(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{scope}') }
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{exception_handler}') }
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{default}') }
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{separator}') }
+        assert_raises(I18n::ReservedInterpolationKey) { interpolate(:foo => :bar, :default => '%{scope}') }
       end
 
       test "interpolation: deep interpolation for default string" do
diff --git a/lib/i18n/tests/localization/date.rb b/lib/i18n/tests/localization/date.rb
index 34fd7a33..2a44371b 100644
--- a/lib/i18n/tests/localization/date.rb
+++ b/lib/i18n/tests/localization/date.rb
@@ -78,15 +78,15 @@ def setup
         end
 
         test "localize Date: given nil it raises I18n::ArgumentError" do
-          assert_raise(I18n::ArgumentError) { I18n.l(nil) }
+          assert_raises(I18n::ArgumentError) { I18n.l(nil) }
         end
 
         test "localize Date: given a plain Object it raises I18n::ArgumentError" do
-          assert_raise(I18n::ArgumentError) { I18n.l(Object.new) }
+          assert_raises(I18n::ArgumentError) { I18n.l(Object.new) }
         end
 
         test "localize Date: given a format is missing it raises I18n::MissingTranslationData" do
-          assert_raise(I18n::MissingTranslationData) { I18n.l(@date, :format => :missing) }
+          assert_raises(I18n::MissingTranslationData) { I18n.l(@date, :format => :missing) }
         end
 
         test "localize Date: it does not alter the format string" do
diff --git a/lib/i18n/tests/localization/date_time.rb b/lib/i18n/tests/localization/date_time.rb
index a4ed9ee5..b09b8880 100644
--- a/lib/i18n/tests/localization/date_time.rb
+++ b/lib/i18n/tests/localization/date_time.rb
@@ -78,7 +78,7 @@ def setup
         end
 
         test "localize DateTime: given a format is missing it raises I18n::MissingTranslationData" do
-          assert_raise(I18n::MissingTranslationData) { I18n.l(@datetime, :format => :missing) }
+          assert_raises(I18n::MissingTranslationData) { I18n.l(@datetime, :format => :missing) }
         end
 
         protected
diff --git a/lib/i18n/tests/localization/time.rb b/lib/i18n/tests/localization/time.rb
index 69287915..7afe176f 100644
--- a/lib/i18n/tests/localization/time.rb
+++ b/lib/i18n/tests/localization/time.rb
@@ -79,7 +79,7 @@ def setup
         end
 
         test "localize Time: given a format is missing it raises I18n::MissingTranslationData" do
-          assert_raise(I18n::MissingTranslationData) { I18n.l(@time, :format => :missing) }
+          assert_raises(I18n::MissingTranslationData) { I18n.l(@time, :format => :missing) }
         end
 
         protected
diff --git a/lib/i18n/tests/lookup.rb b/lib/i18n/tests/lookup.rb
index 61e16cdd..3bd46b8b 100644
--- a/lib/i18n/tests/lookup.rb
+++ b/lib/i18n/tests/lookup.rb
@@ -34,7 +34,7 @@ def setup
       end
 
       test "lookup: given a missing key, no default and the raise option it raises MissingTranslationData" do
-        assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+        assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
       end
 
       test "lookup: does not raise an exception if no translation data is present for the given locale" do
@@ -61,7 +61,7 @@ def setup
       # In fact it probably *should* fail but Rails currently relies on using the default locale instead.
       # So we'll stick to this for now until we get it fixed in Rails.
       test "lookup: given nil as a locale it does not raise but use the default locale" do
-        # assert_raise(I18n::InvalidLocale) { I18n.t(:bar, :locale => nil) }
+        # assert_raises(I18n::InvalidLocale) { I18n.t(:bar, :locale => nil) }
         assert_nothing_raised { I18n.t(:bar, :locale => nil) }
       end
 
diff --git a/lib/i18n/tests/pluralization.rb b/lib/i18n/tests/pluralization.rb
index d3319dcd..19e73f37 100644
--- a/lib/i18n/tests/pluralization.rb
+++ b/lib/i18n/tests/pluralization.rb
@@ -28,7 +28,7 @@ module Pluralization
       end
 
       test "pluralization: given incomplete pluralization data it raises I18n::InvalidPluralizationData" do
-        assert_raise(I18n::InvalidPluralizationData) { I18n.t(:default => { :one => 'bar' }, :count => 2) }
+        assert_raises(I18n::InvalidPluralizationData) { I18n.t(:default => { :one => 'bar' }, :count => 2) }
       end
     end
   end
diff --git a/test/backend/cache_test.rb b/test/backend/cache_test.rb
index bd2efbce..fdd6a8ea 100644
--- a/test/backend/cache_test.rb
+++ b/test/backend/cache_test.rb
@@ -48,14 +48,14 @@ def teardown
   end
 
   test "still raises MissingTranslationData but also caches it" do
-    assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
-    assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
     assert_equal 1, I18n.cache_store.instance_variable_get(:@data).size
 
     # I18n.backend.expects(:lookup).returns(nil)
-    # assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+    # assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
     # I18n.backend.expects(:lookup).never
-    # assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
+    # assert_raises(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }
   end
 
   test "uses 'i18n' as a cache key namespace by default" do
diff --git a/test/backend/cascade_test.rb b/test/backend/cascade_test.rb
index 23ea80e2..39a3dd5e 100644
--- a/test/backend/cascade_test.rb
+++ b/test/backend/cascade_test.rb
@@ -29,9 +29,9 @@ def lookup(key, options = {})
   end
 
   test "raises I18n::MissingTranslationData exception when no translation was found" do
-    assert_raise(I18n::MissingTranslationData) { lookup(:'foo.missing', :raise => true) }
-    assert_raise(I18n::MissingTranslationData) { lookup(:'bar.baz.missing', :raise => true) }
-    assert_raise(I18n::MissingTranslationData) { lookup(:'missing.bar.baz', :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { lookup(:'foo.missing', :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { lookup(:'bar.baz.missing', :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { lookup(:'missing.bar.baz', :raise => true) }
   end
 
   test "cascades before evaluating the default" do
diff --git a/test/backend/fallbacks_test.rb b/test/backend/fallbacks_test.rb
index d2c9ad36..79794e2e 100644
--- a/test/backend/fallbacks_test.rb
+++ b/test/backend/fallbacks_test.rb
@@ -82,12 +82,12 @@ def setup
   end
 
   test "raises I18n::MissingTranslationData exception when fallback is disabled even when fallback translation exists" do
-    assert_raise(I18n::MissingTranslationData) { I18n.t(:foo, :locale => :de, :fallback => false, :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { I18n.t(:foo, :locale => :de, :fallback => false, :raise => true) }
   end
 
   test "raises I18n::MissingTranslationData exception when no translation was found" do
-    assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :en, :raise => true) }
-    assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :de, :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :en, :raise => true) }
+    assert_raises(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :de, :raise => true) }
   end
 
   test "should ensure that default is not splitted on new line char" do
diff --git a/test/backend/interpolation_compiler_test.rb b/test/backend/interpolation_compiler_test.rb
index cffe28f9..35acce38 100644
--- a/test/backend/interpolation_compiler_test.rb
+++ b/test/backend/interpolation_compiler_test.rb
@@ -78,7 +78,7 @@ def test_handles_weird_strings
   end
 
   def test_raises_exception_when_argument_is_missing
-    assert_raise(I18n::MissingInterpolationArgument) do
+    assert_raises(I18n::MissingInterpolationArgument) do
       compile_and_interpolate('%{first} %{last}', :first => 'first')
     end
   end
diff --git a/test/backend/key_value_test.rb b/test/backend/key_value_test.rb
index 1c962fda..aefa9ce6 100644
--- a/test/backend/key_value_test.rb
+++ b/test/backend/key_value_test.rb
@@ -44,7 +44,7 @@ def assert_flattens(expected, nested, escape=true, subtree=true)
 
   test "store_translations does not handle subtrees if desired" do
     setup_backend!(false)
-    assert_raise I18n::MissingTranslationData do
+    assert_raises I18n::MissingTranslationData do
       I18n.t("foo", :raise => true)
     end
   end
@@ -65,7 +65,7 @@ def assert_flattens(expected, nested, escape=true, subtree=true)
   test "subtrees enabled: given incomplete pluralization data it raises I18n::InvalidPluralizationData" do
     setup_backend!
     store_translations(:en, :bar => { :one => "One" })
-    assert_raise(I18n::InvalidPluralizationData) { I18n.t(:bar, :count => 2) }
+    assert_raises(I18n::InvalidPluralizationData) { I18n.t(:bar, :count => 2) }
   end
 
   test "subtrees disabled: given incomplete pluralization data it returns an error message" do
diff --git a/test/backend/simple_test.rb b/test/backend/simple_test.rb
index 960e8cc9..dc5669d5 100644
--- a/test/backend/simple_test.rb
+++ b/test/backend/simple_test.rb
@@ -45,7 +45,7 @@ def setup
 
   # loading translations
   test "simple load_translations: given an unknown file type it raises I18n::UnknownFileType" do
-    assert_raise(I18n::UnknownFileType) { I18n.backend.load_translations("#{locales_dir}/en.xml") }
+    assert_raises(I18n::UnknownFileType) { I18n.backend.load_translations("#{locales_dir}/en.xml") }
   end
 
   test "simple load_translations: given a YAML file name with yaml extension does not raise anything" do
diff --git a/test/backend/transliterator_test.rb b/test/backend/transliterator_test.rb
index c40e2bbf..bf3f198f 100644
--- a/test/backend/transliterator_test.rb
+++ b/test/backend/transliterator_test.rb
@@ -22,7 +22,7 @@ def setup
 
   test "transliteration rule must be a proc or hash" do
     store_translations(:xx, :i18n => {:transliterate => {:rule => ""}})
-    assert_raise I18n::ArgumentError do
+    assert_raises I18n::ArgumentError do
       I18n.backend.transliterate(:xx, "ü")
     end
   end
@@ -57,7 +57,7 @@ def setup
   end
 
   test "default transliterator raises errors for invalid UTF-8" do
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       @transliterator.transliterate("a\x92b")
     end
   end
diff --git a/test/i18n/exceptions_test.rb b/test/i18n/exceptions_test.rb
index 1c37cdb2..771308d0 100644
--- a/test/i18n/exceptions_test.rb
+++ b/test/i18n/exceptions_test.rb
@@ -49,7 +49,7 @@ def test_invalid_locale_stores_locale
   end
 
   test "MissingInterpolationArgument stores key and string" do
-    assert_raise(I18n::MissingInterpolationArgument) { force_missing_interpolation_argument }
+    assert_raises(I18n::MissingInterpolationArgument) { force_missing_interpolation_argument }
     force_missing_interpolation_argument do |exception|
       assert_equal :bar, exception.key
       assert_equal "%{bar}", exception.string
diff --git a/test/i18n/interpolate_test.rb b/test/i18n/interpolate_test.rb
index 15f9b892..79e59a99 100644
--- a/test/i18n/interpolate_test.rb
+++ b/test/i18n/interpolate_test.rb
@@ -32,12 +32,12 @@ class I18nInterpolateTest < I18n::TestCase
     assert_equal "  1", I18n.interpolate("%<num>3.0f", :num => 1.0)
     assert_equal "100.00", I18n.interpolate("%<num>2.2f", :num => 100.0)
     assert_equal "0x64", I18n.interpolate("%<num>#x", :num => 100.0)
-    assert_raise(ArgumentError) { I18n.interpolate("%<num>,d", :num => 100) }
-    assert_raise(ArgumentError) { I18n.interpolate("%<num>/d", :num => 100) }
+    assert_raises(ArgumentError) { I18n.interpolate("%<num>,d", :num => 100) }
+    assert_raises(ArgumentError) { I18n.interpolate("%<num>/d", :num => 100) }
   end
 
   test "String interpolation raises an I18n::MissingInterpolationArgument when the string has extra placeholders" do
-    assert_raise(I18n::MissingInterpolationArgument, "key not found") do
+    assert_raises(I18n::MissingInterpolationArgument, "key not found") do
       I18n.interpolate("%{first} %{last}", :first => 'Masao')
     end
   end
diff --git a/test/i18n/load_path_test.rb b/test/i18n/load_path_test.rb
index 804aa88f..7d0d27a1 100644
--- a/test/i18n/load_path_test.rb
+++ b/test/i18n/load_path_test.rb
@@ -14,14 +14,14 @@ def setup
   end
 
   test "loading an empty yml file raises an InvalidLocaleData exception" do
-    assert_raise I18n::InvalidLocaleData do
+    assert_raises I18n::InvalidLocaleData do
       I18n.load_path = [[locales_dir + '/invalid/empty.yml']]
       I18n.t(:'foo.bar', :default => "baz")
     end
   end
 
   test "loading an invalid yml file raises an InvalidLocaleData exception" do
-    assert_raise I18n::InvalidLocaleData do
+    assert_raises I18n::InvalidLocaleData do
       I18n.load_path = [[locales_dir + '/invalid/syntax.yml']]
       I18n.t(:'foo.bar', :default => "baz")
     end
diff --git a/test/i18n_test.rb b/test/i18n_test.rb
index fbe7faf1..f7e3a459 100644
--- a/test/i18n_test.rb
+++ b/test/i18n_test.rb
@@ -40,13 +40,13 @@ def setup
   end
 
   test "default_locale= doesn't ignore junk" do
-    assert_raise(NoMethodError) { I18n.default_locale = Class }
+    assert_raises(NoMethodError) { I18n.default_locale = Class }
   end
 
   test "raises an I18n::InvalidLocale exception when setting an unavailable default locale" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.default_locale = :klingon }
+      assert_raises(I18n::InvalidLocale) { I18n.default_locale = :klingon }
     ensure
       I18n.config.enforce_available_locales = false
     end
@@ -64,13 +64,13 @@ def setup
   end
 
   test "locale= doesn't ignore junk" do
-    assert_raise(NoMethodError) { I18n.locale = Class }
+    assert_raises(NoMethodError) { I18n.locale = Class }
   end
 
   test "raises an I18n::InvalidLocale exception when setting an unavailable locale" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.locale = :klingon }
+      assert_raises(I18n::InvalidLocale) { I18n.locale = :klingon }
     ensure
       I18n.config.enforce_available_locales = false
     end
@@ -213,15 +213,15 @@ def setup
   end
 
   test "translate given an empty string as a key raises an I18n::ArgumentError" do
-    assert_raise(I18n::ArgumentError) { I18n.t("") }
+    assert_raises(I18n::ArgumentError) { I18n.t("") }
   end
 
   test "translate given an empty symbol as a key raises an I18n::ArgumentError" do
-    assert_raise(I18n::ArgumentError) { I18n.t(:"") }
+    assert_raises(I18n::ArgumentError) { I18n.t(:"") }
   end
 
   test "translate given an array with empty string as a key raises an I18n::ArgumentError" do
-    assert_raise(I18n::ArgumentError) { I18n.t(["", :foo]) }
+    assert_raises(I18n::ArgumentError) { I18n.t(["", :foo]) }
   end
 
   test "translate given an empty array as a key returns empty array" do
@@ -235,7 +235,7 @@ def setup
   test "translate given an unavailable locale rases an I18n::InvalidLocale" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.t(:foo, :locale => 'klingon') }
+      assert_raises(I18n::InvalidLocale) { I18n.t(:foo, :locale => 'klingon') }
     ensure
       I18n.config.enforce_available_locales = false
     end
@@ -251,7 +251,7 @@ def setup
 
   test "translate raises Disabled if locale is false" do
     I18n.with_locale(false) do
-      assert_raise I18n::Disabled do
+      assert_raises I18n::Disabled do
         I18n.t('foo')
       end
 
@@ -262,7 +262,7 @@ def setup
   test "available_locales can be replaced at runtime" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.t(:foo, :locale => 'klingon') }
+      assert_raises(I18n::InvalidLocale) { I18n.t(:foo, :locale => 'klingon') }
       old_locales, I18n.config.available_locales = I18n.config.available_locales, [:klingon]
       I18n.t(:foo, :locale => 'klingon')
     ensure
@@ -302,7 +302,7 @@ def setup
 
   test "exists? raises Disabled if locale is false" do
     I18n.with_locale(false) do
-      assert_raise I18n::Disabled do
+      assert_raises I18n::Disabled do
         I18n.exists?(:bogus)
       end
 
@@ -311,7 +311,7 @@ def setup
   end
 
   test "localize given nil raises an I18n::ArgumentError" do
-    assert_raise(I18n::ArgumentError) { I18n.l nil }
+    assert_raises(I18n::ArgumentError) { I18n.l nil }
   end
 
   test "localize given nil and default returns default" do
@@ -319,13 +319,13 @@ def setup
   end
 
   test "localize given an Object raises an I18n::ArgumentError" do
-    assert_raise(I18n::ArgumentError) { I18n.l Object.new }
+    assert_raises(I18n::ArgumentError) { I18n.l Object.new }
   end
 
   test "localize given an unavailable locale rases an I18n::InvalidLocale" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.l(Time.now, :locale => 'klingon') }
+      assert_raises(I18n::InvalidLocale) { I18n.l(Time.now, :locale => 'klingon') }
     ensure
       I18n.config.enforce_available_locales = false
     end
@@ -333,7 +333,7 @@ def setup
 
   test "localize raises Disabled if locale is false" do
     I18n.with_locale(false) do
-      assert_raise I18n::Disabled do
+      assert_raises I18n::Disabled do
         I18n.l(Time.now)
       end
     end
@@ -375,14 +375,14 @@ def call(exception, locale, key, options); key; end
   end
 
   test "I18n.with_locale resets the locale in case of errors" do
-    assert_raise(I18n::ArgumentError) { I18n.with_locale(:pl) { raise I18n::ArgumentError } }
+    assert_raises(I18n::ArgumentError) { I18n.with_locale(:pl) { raise I18n::ArgumentError } }
     assert_equal I18n.default_locale, I18n.locale
   end
 
   test "I18n.translitarate handles I18n::ArgumentError exception" do
     I18n::Backend::Transliterator.stubs(:get).raises(I18n::ArgumentError)
     I18n.exception_handler.expects(:call).raises(I18n::ArgumentError)
-    assert_raise(I18n::ArgumentError) {
+    assert_raises(I18n::ArgumentError) {
       I18n.transliterate("ąćó")
     }
   end
@@ -390,7 +390,7 @@ def call(exception, locale, key, options); key; end
   test "I18n.translitarate raises I18n::ArgumentError exception" do
     I18n::Backend::Transliterator.stubs(:get).raises(I18n::ArgumentError)
     I18n.exception_handler.expects(:call).never
-    assert_raise(I18n::ArgumentError) {
+    assert_raises(I18n::ArgumentError) {
       I18n.transliterate("ąćó", :raise => true)
     }
   end
@@ -398,7 +398,7 @@ def call(exception, locale, key, options); key; end
   test "transliterate given an unavailable locale rases an I18n::InvalidLocale" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.transliterate('string', :locale => 'klingon') }
+      assert_raises(I18n::InvalidLocale) { I18n.transliterate('string', :locale => 'klingon') }
     ensure
       I18n.config.enforce_available_locales = false
     end
@@ -425,7 +425,7 @@ def call(exception, locale, key, options); key; end
   test "I18n.enforce_available_locales! raises an I18n::InvalidLocale when the passed locale is unavailable" do
     begin
       I18n.config.enforce_available_locales = true
-      assert_raise(I18n::InvalidLocale) { I18n.enforce_available_locales!(:klingon) }
+      assert_raises(I18n::InvalidLocale) { I18n.enforce_available_locales!(:klingon) }
     ensure
       I18n.config.enforce_available_locales = false
     end
@@ -462,13 +462,13 @@ def call(exception, locale, key, options); key; end
 
       I18n.enforce_available_locales = true
 
-      assert_raise(I18n::InvalidLocale) { I18n.default_locale = :de }
-      assert_raise(I18n::InvalidLocale) { I18n.locale = :de }
+      assert_raises(I18n::InvalidLocale) { I18n.default_locale = :de }
+      assert_raises(I18n::InvalidLocale) { I18n.locale = :de }
 
       store_translations(:de, :foo => 'Foo in :de')
 
-      assert_raise(I18n::InvalidLocale) { I18n.default_locale = :de }
-      assert_raise(I18n::InvalidLocale) { I18n.locale = :de }
+      assert_raises(I18n::InvalidLocale) { I18n.default_locale = :de }
+      assert_raises(I18n::InvalidLocale) { I18n.locale = :de }
 
       I18n.reload!
 
diff --git a/test/locale/fallbacks_test.rb b/test/locale/fallbacks_test.rb
index dbfca921..aa3ca9d7 100644
--- a/test/locale/fallbacks_test.rb
+++ b/test/locale/fallbacks_test.rb
@@ -154,7 +154,7 @@ def setup
   # Test I18n::Disabled  is raised correctly when locale is false during fallback
 
   test "with locale equals false" do
-    assert_raise I18n::Disabled do
+    assert_raises I18n::Disabled do
       @fallbacks[false]
     end
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1f4217e5..513288cf 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,7 +3,6 @@
 
 # TODO: Remove these aliases and update tests accordingly.
 class TEST_CASE
-  alias :assert_raise :assert_raises
   alias :assert_not_equal :refute_equal
 
   def assert_nothing_raised(*args)

From 49a212fa69dedb794b6a537443388fbd0ce5cfbb Mon Sep 17 00:00:00 2001
From: Paarth Madan <paarth.madan@shopify.com>
Date: Tue, 14 Dec 2021 13:49:25 -0500
Subject: [PATCH 2/3] Remove alias for assert_not_equal

---
 test/backend/transliterator_test.rb | 2 +-
 test/i18n/middleware_test.rb        | 2 +-
 test/test_helper.rb                 | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/backend/transliterator_test.rb b/test/backend/transliterator_test.rb
index bf3f198f..ebd446e2 100644
--- a/test/backend/transliterator_test.rb
+++ b/test/backend/transliterator_test.rb
@@ -74,7 +74,7 @@ def setup
   test "default transliterator fails with custom rules with uncomposed input" do
     char = [117, 776].pack("U*") # "ü" as ASCII "u" plus COMBINING DIAERESIS
     transliterator = I18n::Backend::Transliterator.get(@hash)
-    assert_not_equal "ue", transliterator.transliterate(char)
+    refute_equal "ue", transliterator.transliterate(char)
   end
 
   test "DEFAULT_APPROXIMATIONS is frozen to prevent concurrency issues" do
diff --git a/test/i18n/middleware_test.rb b/test/i18n/middleware_test.rb
index 2190d189..c8f6d36f 100644
--- a/test/i18n/middleware_test.rb
+++ b/test/i18n/middleware_test.rb
@@ -13,7 +13,7 @@ def setup
     @middleware.call({})
 
     updated_i18n_config_object_id = Thread.current[:i18n_config].object_id
-    assert_not_equal updated_i18n_config_object_id, old_i18n_config_object_id
+    refute_equal updated_i18n_config_object_id, old_i18n_config_object_id
   end
 
   test "succesfully resets i18n locale to default locale by defining new config" do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 513288cf..13fe1c54 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,8 +3,6 @@
 
 # TODO: Remove these aliases and update tests accordingly.
 class TEST_CASE
-  alias :assert_not_equal :refute_equal
-
   def assert_nothing_raised(*args)
     yield
   end

From 96d1f1daf0f417a81f41a4a5cb7fb140ab7d1bab Mon Sep 17 00:00:00 2001
From: Paarth Madan <paarth.madan@shopify.com>
Date: Tue, 14 Dec 2021 13:49:43 -0500
Subject: [PATCH 3/3] Default test to Minitest::Test

---
 test/test_helper.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 13fe1c54..b2d2c0af 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,19 +1,14 @@
 require 'minitest/autorun'
-TEST_CASE = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
-
-# TODO: Remove these aliases and update tests accordingly.
-class TEST_CASE
-  def assert_nothing_raised(*args)
-    yield
-  end
-end
-
 require 'bundler/setup'
 require 'i18n'
 require 'mocha/setup'
 require 'test_declarative'
 
-class I18n::TestCase < TEST_CASE
+class I18n::TestCase < Minitest::Test
+  def assert_nothing_raised(*args)
+    yield
+  end
+
   def self.key_value?
     defined?(ActiveSupport)
   end