From 99a01016fcfbf2147630e6cc2de53d79c8b8e876 Mon Sep 17 00:00:00 2001 From: Vasily Fedoseyev Date: Mon, 23 Oct 2023 15:43:13 +0300 Subject: [PATCH] More rubocop --- test/backends/chained_test.rb | 4 +++- test/backends/pluralizing_test.rb | 8 +++++--- test/backends/static_test.rb | 2 ++ test/i18n/missing_translations_test.rb | 2 ++ test/load_path_test.rb | 2 ++ test/locale/active_record_test.rb | 2 ++ test/locale/fallbacks_test.rb | 2 ++ test/locale/language_tag_test.rb | 2 ++ test/model/active_record/migration_test.rb | 2 ++ test/model/active_record/postgres_array_test.rb | 2 +- test/model/active_record/sti_translated_test.rb | 2 ++ test/model/active_record/translated_test.rb | 2 ++ test/translation_test.rb | 2 ++ 13 files changed, 29 insertions(+), 5 deletions(-) diff --git a/test/backends/chained_test.rb b/test/backends/chained_test.rb index 54898a5..1046cd2 100644 --- a/test/backends/chained_test.rb +++ b/test/backends/chained_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/backend/chain' @@ -49,7 +51,7 @@ def setup assert_nothing_raised { I18n.backend.add Globalize::Backend::Dummy.new, Globalize::Backend::Dummy, :dummy } assert_instance_of Globalize::Backend::Dummy, I18n.backend.send(:backends).first assert_equal([Globalize::Backend::Dummy, Globalize::Backend::Dummy, Globalize::Backend::Dummy], - I18n.backend.send(:backends).map { |backend| backend.class }) + I18n.backend.send(:backends).map(&:class)) end end diff --git a/test/backends/pluralizing_test.rb b/test/backends/pluralizing_test.rb index 2987b08..2907548 100644 --- a/test/backends/pluralizing_test.rb +++ b/test/backends/pluralizing_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/backend/pluralizing' @@ -8,7 +10,7 @@ def setup if c == 1 :one else - (2..4).include?(c) ? :few : :other + (2..4).cover?(c) ? :few : :other end } end @@ -34,7 +36,7 @@ def setup if c == 1 :one else - (2..4).include?(c) ? :few : :other + (2..4).cover?(c) ? :few : :other end } @backend.store_translations :en, foo: { one: 'one en foo', other: 'many en foos' } @@ -57,7 +59,7 @@ def setup if c == 1 :one else - (2..4).include?(c) ? :few : :other + (2..4).cover?(c) ? :few : :other end } @backend.store_translations :en, foo: { one: 'one en foo', other: 'many en foos' } diff --git a/test/backends/static_test.rb b/test/backends/static_test.rb index 12045df..be36a08 100644 --- a/test/backends/static_test.rb +++ b/test/backends/static_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/backend/static' require 'globalize/translation' diff --git a/test/i18n/missing_translations_test.rb b/test/i18n/missing_translations_test.rb index d679cd0..5cace34 100644 --- a/test/i18n/missing_translations_test.rb +++ b/test/i18n/missing_translations_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/i18n/missing_translations_log_handler' diff --git a/test/load_path_test.rb b/test/load_path_test.rb index 4a9f49b..cd07d28 100644 --- a/test/load_path_test.rb +++ b/test/load_path_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require_relative 'test_helper' require 'globalize/load_path' diff --git a/test/locale/active_record_test.rb b/test/locale/active_record_test.rb index 5f440fe..df0b471 100644 --- a/test/locale/active_record_test.rb +++ b/test/locale/active_record_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/locale/fallbacks' diff --git a/test/locale/fallbacks_test.rb b/test/locale/fallbacks_test.rb index 8484177..7653328 100644 --- a/test/locale/fallbacks_test.rb +++ b/test/locale/fallbacks_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/locale/fallbacks' diff --git a/test/locale/language_tag_test.rb b/test/locale/language_tag_test.rb index 2b1bb9b..60b7b62 100644 --- a/test/locale/language_tag_test.rb +++ b/test/locale/language_tag_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', 'test_helper') require 'globalize/locale/language_tag' diff --git a/test/model/active_record/migration_test.rb b/test/model/active_record/migration_test.rb index b70dad7..73aad70 100644 --- a/test/model/active_record/migration_test.rb +++ b/test/model/active_record/migration_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') require 'active_record' require 'globalize/model/active_record' diff --git a/test/model/active_record/postgres_array_test.rb b/test/model/active_record/postgres_array_test.rb index 536f897..76cc687 100644 --- a/test/model/active_record/postgres_array_test.rb +++ b/test/model/active_record/postgres_array_test.rb @@ -170,6 +170,6 @@ class PostgresArrayTest < ActiveSupport::TestCase "}' array = Globalize::Model::ActiveRecord::PostgresArray.new(string) - assert_equal array.pg_string, string.gsub(/}/, '\}').gsub(/{/, '\{').sub(/\A\\/, '').gsub(/\\}\z/, '}') + assert_equal array.pg_string, string.gsub(/}/, '\}').gsub(/{/, '\{').delete_prefix('\\').gsub(/\\}\z/, '}') end end diff --git a/test/model/active_record/sti_translated_test.rb b/test/model/active_record/sti_translated_test.rb index 104d086..0c1e335 100644 --- a/test/model/active_record/sti_translated_test.rb +++ b/test/model/active_record/sti_translated_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') require 'active_record' require 'globalize/model/active_record' diff --git a/test/model/active_record/translated_test.rb b/test/model/active_record/translated_test.rb index ec88465..fd4dfaf 100644 --- a/test/model/active_record/translated_test.rb +++ b/test/model/active_record/translated_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'test_helper') require 'active_record' require 'globalize/model/active_record' diff --git a/test/translation_test.rb b/test/translation_test.rb index cd596b1..ab8a4c4 100644 --- a/test/translation_test.rb +++ b/test/translation_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require_relative 'test_helper' require 'globalize/translation'