Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up unneeded test aliases #589

Merged
merged 3 commits into from Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/i18n/tests/defaults.rb
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions lib/i18n/tests/interpolation.rb
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lib/i18n/tests/localization/date.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/tests/localization/date_time.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/tests/localization/time.rb
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/i18n/tests/lookup.rb
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/tests/pluralization.rb
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/backend/cache_test.rb
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/backend/cascade_test.rb
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/backend/fallbacks_test.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/backend/interpolation_compiler_test.rb
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/backend/key_value_test.rb
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/backend/simple_test.rb
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/backend/transliterator_test.rb
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/i18n/exceptions_test.rb
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/i18n/interpolate_test.rb
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/i18n/load_path_test.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/i18n/middleware_test.rb
Expand Up @@ -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
Expand Down