From d113aabf335ca0bbea2223a8136c2161b7f43659 Mon Sep 17 00:00:00 2001
From: Koichi ITO <koic.ito@gmail.com>
Date: Tue, 30 Aug 2022 08:41:49 +0900
Subject: [PATCH] Enable pending cops

Note that `Gemspec/RequireMFA` is enabled.

Please refer to the article below for RubyGems MFA status.
https://blog.rubygems.org/2022/08/15/requiring-mfa-on-popular-gems.html
---
 .rubocop.yml                              | 10 ++++++++++
 faker.gemspec                             |  2 ++
 lib/faker.rb                              |  2 +-
 lib/faker/blockchain/aeternity.rb         |  2 +-
 lib/faker/blockchain/ethereum.rb          |  2 +-
 lib/faker/blockchain/tezos.rb             |  2 +-
 lib/faker/default/bank.rb                 |  6 +++---
 lib/faker/default/chile_rut.rb            |  2 +-
 lib/faker/default/code.rb                 | 12 ++++++------
 lib/faker/default/company.rb              |  8 ++++----
 lib/faker/default/finance.rb              |  4 ++--
 lib/faker/default/id_number.rb            |  2 +-
 lib/faker/default/internet.rb             |  6 +++---
 lib/faker/default/markdown.rb             |  6 +++---
 lib/faker/default/nhs.rb                  |  2 +-
 lib/faker/default/vehicle.rb              | 10 +++++-----
 lib/faker/japanese_media/kamen_rider.rb   |  4 ++--
 lib/helpers/base58.rb                     |  2 +-
 script/txt2html                           |  2 +-
 tasks/website.rake                        |  2 +-
 test/faker/default/test_alphanum.rb       |  4 ++--
 test/faker/default/test_faker_company.rb  | 10 +++++-----
 test/faker/default/test_faker_food.rb     |  2 +-
 test/faker/default/test_faker_lorem.rb    |  2 +-
 test/faker/default/test_faker_markdown.rb | 12 ++++++------
 test/faker/default/test_faker_omniauth.rb | 10 +++++-----
 test/faker/default/test_faker_tea.rb      |  4 ++--
 test/faker/default/test_faker_types.rb    |  6 +++---
 test/test_en_gb_locale.rb                 |  6 +++---
 test/test_es_ar_locale.rb                 |  4 ++--
 30 files changed, 80 insertions(+), 68 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ef419ef8ef..dbfae1c684 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,11 @@
 AllCops:
   TargetRubyVersion: 2.7
+  NewCops: enable
+
+# Suppress noise for obvious operator precedence.
+Lint/AmbiguousOperatorPrecedence:
+  Description: Checks for expressions containing multiple binary operations with ambiguous precedence.
+  Enabled: false
 
 Layout/LineLength:
   Description: This cop checks the length of lines in the source code. The maximum length is configurable.
@@ -53,6 +59,10 @@ Style/Documentation:
   Description: This cop checks for missing top-level documentation of classes and modules.
   Enabled: false
 
+Style/DocumentDynamicEvalDefinition:
+  Description: When using `class_eval` (or other `eval`) with string interpolation, add a comment block showing its appearance if interpolated.
+  Enabled: false
+
 Style/EvalWithLocation:
   Description: This cop checks eval method usage. eval can receive source location metadata, that are filename and line number.
   Exclude:
diff --git a/faker.gemspec b/faker.gemspec
index bca438c222..5c31ae555a 100644
--- a/faker.gemspec
+++ b/faker.gemspec
@@ -3,6 +3,7 @@
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'faker/version'
 
+# rubocop:todo Gemspec/RequireMFA
 Gem::Specification.new do |spec|
   spec.name        = 'faker'
   spec.version     = Faker::VERSION
@@ -42,3 +43,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('timecop', '0.9.5')
   spec.add_development_dependency('yard', '0.9.27')
 end
+# rubocop:enable Gemspec/RequireMFA
diff --git a/lib/faker.rb b/lib/faker.rb
index 9749ed0e22..84e99a23aa 100644
--- a/lib/faker.rb
+++ b/lib/faker.rb
@@ -92,7 +92,7 @@ def regexify(reg)
           .gsub(/(\\?.)\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                      # A{1,2} becomes A or AA or \d{3} becomes \d\d\d
           .gsub(/\((.*?)\)/) { |match| sample(match.gsub(/[()]/, '').split('|')) } # (this|that) becomes 'this' or 'that'
           .gsub(/\[([^\]]+)\]/) { |match| match.gsub(/(\w-\w)/) { |range| sample(Array(Range.new(*range.split('-')))) } } # All A-Z inside of [] become C (or X, or whatever)
-          .gsub(/\[([^\]]+)\]/) { |_match| sample(Regexp.last_match(1).split('')) } # All [ABC] become B (or A or C)
+          .gsub(/\[([^\]]+)\]/) { |_match| sample(Regexp.last_match(1).chars) } # All [ABC] become B (or A or C)
           .gsub('\d') { |_match| sample(Numbers) }
           .gsub('\w') { |_match| sample(Letters) }
       end
diff --git a/lib/faker/blockchain/aeternity.rb b/lib/faker/blockchain/aeternity.rb
index 4ee4556a32..1c019d7766 100644
--- a/lib/faker/blockchain/aeternity.rb
+++ b/lib/faker/blockchain/aeternity.rb
@@ -61,7 +61,7 @@ def oracle
         def rand_strings(length = 50)
           hex_alphabet = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
           var = +''
-          length.times { var << sample(shuffle(hex_alphabet.split(''))) }
+          length.times { var << sample(shuffle(hex_alphabet.chars)) }
           var
         end
       end
diff --git a/lib/faker/blockchain/ethereum.rb b/lib/faker/blockchain/ethereum.rb
index 8d60bd2a97..3540698234 100644
--- a/lib/faker/blockchain/ethereum.rb
+++ b/lib/faker/blockchain/ethereum.rb
@@ -17,7 +17,7 @@ class << self
         def address
           hex_alphabet = '0123456789abcdef'
           var = +'0x'
-          40.times { var << sample(shuffle(hex_alphabet.split(''))) }
+          40.times { var << sample(shuffle(hex_alphabet.chars)) }
           var
         end
       end
diff --git a/lib/faker/blockchain/tezos.rb b/lib/faker/blockchain/tezos.rb
index 201095bbe3..94747269bd 100644
--- a/lib/faker/blockchain/tezos.rb
+++ b/lib/faker/blockchain/tezos.rb
@@ -125,7 +125,7 @@ def secret_key
         # @return [String]
         def encode_tz(prefix, payload_size)
           prefix = PREFIXES.fetch(prefix)
-          packed = prefix.map(&:chr).join('') + Faker::Config.random.bytes(payload_size)
+          packed = prefix.map(&:chr).join + Faker::Config.random.bytes(payload_size)
           checksum = OpenSSL::Digest::SHA256.digest(OpenSSL::Digest::SHA256.digest(packed))[0..3]
           Faker::Base58.encode(packed + checksum)
         end
diff --git a/lib/faker/default/bank.rb b/lib/faker/default/bank.rb
index 9d415bde4e..50f7c16383 100644
--- a/lib/faker/default/bank.rb
+++ b/lib/faker/default/bank.rb
@@ -145,7 +145,7 @@ def bsb_number
       private
 
       def checksum(num_string)
-        num_array = num_string.split('').map(&:to_i)
+        num_array = num_string.chars.map(&:to_i)
         (
           7 * (num_array[0] + num_array[3] + num_array[6]) +
             3 * (num_array[1] + num_array[4] + num_array[7]) +
@@ -194,8 +194,8 @@ def valid_checksum?(routing_number, checksum)
 
       def compile_fraction(routing_num)
         prefix = (1..50).to_a.map(&:to_s).sample
-        numerator = routing_num.split('')[5..8].join.to_i.to_s
-        denominator = routing_num.split('')[0..4].join.to_i.to_s
+        numerator = routing_num.chars[5..8].join.to_i.to_s
+        denominator = routing_num.chars[0..4].join.to_i.to_s
         "#{prefix}-#{numerator}/#{denominator}"
       end
 
diff --git a/lib/faker/default/chile_rut.rb b/lib/faker/default/chile_rut.rb
index 1ec982c0dc..f8e22241f3 100644
--- a/lib/faker/default/chile_rut.rb
+++ b/lib/faker/default/chile_rut.rb
@@ -37,7 +37,7 @@ def rut(legacy_min_rut = NOT_GIVEN, legacy_fixed = NOT_GIVEN, min_rut: 1, fixed:
       #
       # @faker.version 1.9.2
       def dv
-        split_reversed_rut = @last_rut.to_s.reverse.split('')
+        split_reversed_rut = @last_rut.to_s.reverse.chars
         seq = [2, 3, 4, 5, 6, 7]
         i = 0
         digit_sum = split_reversed_rut.reduce(0) do |sum, n|
diff --git a/lib/faker/default/code.rb b/lib/faker/default/code.rb
index 3b303fbbd3..6f0e0f4e50 100644
--- a/lib/faker/default/code.rb
+++ b/lib/faker/default/code.rb
@@ -206,7 +206,7 @@ def generate_imei
         str[len - 1] = (10 - (sum % 10)) % 10
 
         # Output the IMEI value.
-        str.join('')
+        str.join
       end
 
       def generate_base10_isbn
@@ -222,20 +222,20 @@ def generate_base13_isbn
       end
 
       def sum(values)
-        values.split(//).each_with_index.inject(0) do |sum, (value, index)|
+        values.chars.each_with_index.inject(0) do |sum, (value, index)|
           sum + yield(value, index)
         end
       end
 
       def generate_base8_ean
         values = regexify(/\d{7}/)
-        check_digit = 10 - values.split(//).each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT8[i] } % 10
+        check_digit = 10 - values.chars.each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT8[i] } % 10
         values << (check_digit == 10 ? 0 : check_digit).to_s
       end
 
       def generate_base13_ean
         values = regexify(/\d{12}/)
-        check_digit = 10 - values.split(//).each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT13[i] } % 10
+        check_digit = 10 - values.chars.each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT13[i] } % 10
         values << (check_digit == 10 ? 0 : check_digit).to_s
       end
 
@@ -243,13 +243,13 @@ def generate_base13_ean
       EAN_CHECK_DIGIT13 = [1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3].freeze
 
       def rut_verificator_digit(rut)
-        total = rut.to_s.rjust(8, '0').split(//).zip(%w[3 2 7 6 5 4 3 2]).collect { |a, b| a.to_i * b.to_i }.inject(:+)
+        total = rut.to_s.rjust(8, '0').chars.zip(%w[3 2 7 6 5 4 3 2]).collect { |a, b| a.to_i * b.to_i }.inject(:+)
         (11 - total % 11).to_s.gsub(/10/, 'k').gsub(/11/, '0')
       end
 
       def generate_nric_check_alphabet(values, prefix)
         weight = %w[2 7 6 5 4 3 2]
-        total = values.split(//).zip(weight).collect { |a, b| a.to_i * b.to_i }.inject(:+)
+        total = values.chars.zip(weight).collect { |a, b| a.to_i * b.to_i }.inject(:+)
         total += 4 if prefix == 'T'
         %w[A B C D E F G H I Z J][10 - total % 11]
       end
diff --git a/lib/faker/default/company.rb b/lib/faker/default/company.rb
index 6a3f9d1168..374252dc05 100644
--- a/lib/faker/default/company.rb
+++ b/lib/faker/default/company.rb
@@ -296,7 +296,7 @@ def polish_taxpayer_identification_number
           result = Array.new(3) { rand(1..9) } + Array.new(7) { rand(10) }
           break if (weight_sum(result, weights) % 11) == result[9]
         end
-        result.join('')
+        result.join
       end
 
       ##
@@ -321,7 +321,7 @@ def polish_register_of_national_economy(legacy_length = NOT_GIVEN, length: 9)
           random_digits = Array.new(length) { rand(10) }
           break if collect_regon_sum(random_digits) == random_digits.last
         end
-        random_digits.join('')
+        random_digits.join
       end
 
       ##
@@ -459,7 +459,7 @@ def mod11(number)
       def luhn_algorithm(number)
         multiplications = []
 
-        number.to_s.reverse.split(//).each_with_index do |digit, i|
+        number.to_s.reverse.chars.each_with_index do |digit, i|
           multiplications << if i.even?
                                digit.to_i * 2
                              else
@@ -553,7 +553,7 @@ def inn_checksum(factor, number)
       def spanish_cif_control_digit(organization_type, code)
         letters = %w[J A B C D E F G H I]
 
-        control = code.split('').each_with_index.inject(0) do |sum, (value, index)|
+        control = code.chars.each_with_index.inject(0) do |sum, (value, index)|
           if (index + 1).even?
             sum + value.to_i
           else
diff --git a/lib/faker/default/finance.rb b/lib/faker/default/finance.rb
index 9d40374258..507a578ed1 100644
--- a/lib/faker/default/finance.rb
+++ b/lib/faker/default/finance.rb
@@ -28,9 +28,9 @@ def credit_card(*types)
 
         # calculate the luhn checksum digit
         multiplier = 1
-        luhn_sum = template.gsub(/[^0-9]/, '').split('').reverse.map(&:to_i).inject(0) do |sum, digit|
+        luhn_sum = template.gsub(/[^0-9]/, '').chars.reverse.map(&:to_i).inject(0) do |sum, digit|
           multiplier = (multiplier == 2 ? 1 : 2)
-          sum + (digit * multiplier).to_s.split('').map(&:to_i).inject(0) { |digit_sum, cur| digit_sum + cur }
+          sum + (digit * multiplier).to_s.chars.map(&:to_i).inject(0) { |digit_sum, cur| digit_sum + cur }
         end
 
         # the sum plus whatever the last digit is must be a multiple of 10. So, the
diff --git a/lib/faker/default/id_number.rb b/lib/faker/default/id_number.rb
index 5fb3eb6781..73a4eef722 100644
--- a/lib/faker/default/id_number.rb
+++ b/lib/faker/default/id_number.rb
@@ -332,7 +332,7 @@ def south_african_id_checksum_digit(id_number)
                                             .with_index { |_, i| (i + 1).odd? }
 
         sum_of_odd_digits = odd_digits_without_last_character.map(&:to_i).reduce(:+)
-        even_digits_times_two = (even_digits.join('').to_i * 2).to_s
+        even_digits_times_two = (even_digits.join.to_i * 2).to_s
         sum_of_even_digits = even_digits_times_two.chars.map(&:to_i).reduce(:+)
 
         total_sum = sum_of_odd_digits + sum_of_even_digits
diff --git a/lib/faker/default/internet.rb b/lib/faker/default/internet.rb
index 88875ef9d6..e458c5186c 100644
--- a/lib/faker/default/internet.rb
+++ b/lib/faker/default/internet.rb
@@ -270,7 +270,7 @@ def fix_umlauts(legacy_string = NOT_GIVEN, string: '')
       # @example
       #   Faker::Internet.domain_word   #=> "senger"
       def domain_word
-        with_locale(:en) { Char.prepare(Company.name.split(' ').first) }
+        with_locale(:en) { Char.prepare(Company.name.split.first) }
       end
 
       ## Returns the domain suffix e.g. com, org, co, biz, info etc.
@@ -613,10 +613,10 @@ def sanitize_email_local_part(local_part)
           Array('0'..'9'),
           Array('A'..'Z'),
           Array('a'..'z'),
-          "!#$%&'*+-/=?^_`{|}~.".split(//)
+          "!#$%&'*+-/=?^_`{|}~.".chars
         ].flatten
 
-        local_part.split(//).map do |char|
+        local_part.chars.map do |char|
           char_range.include?(char) ? char : '#'
         end.join
       end
diff --git a/lib/faker/default/markdown.rb b/lib/faker/default/markdown.rb
index 6dca8fc34e..5f2a48b55b 100644
--- a/lib/faker/default/markdown.rb
+++ b/lib/faker/default/markdown.rb
@@ -27,7 +27,7 @@ def headers
       # @faker.version 1.8.0
       def emphasis
         paragraph = Faker::Lorem.paragraph(sentence_count: 3)
-        words = paragraph.split(' ')
+        words = paragraph.split
         position = rand(0..words.length - 1)
         formatting = fetch('markdown.emphasis')
         words[position] = "#{formatting}#{words[position]}#{formatting}"
@@ -50,7 +50,7 @@ def ordered_list
         number.times do |i|
           result << "#{i}. #{Faker::Lorem.sentence(word_count: 1)} \n"
         end
-        result.join('')
+        result.join
       end
 
       ##
@@ -69,7 +69,7 @@ def unordered_list
         number.times do |_i|
           result << "* #{Faker::Lorem.sentence(word_count: 1)} \n"
         end
-        result.join('')
+        result.join
       end
 
       ##
diff --git a/lib/faker/default/nhs.rb b/lib/faker/default/nhs.rb
index 70bf8dd142..298950184d 100644
--- a/lib/faker/default/nhs.rb
+++ b/lib/faker/default/nhs.rb
@@ -21,7 +21,7 @@ def british_number
                                                            .chars
                                                            .insert(3, ' ')
                                                            .insert(7, ' ')
-                                                           .join('')
+                                                           .join
       end
 
       ##
diff --git a/lib/faker/default/vehicle.rb b/lib/faker/default/vehicle.rb
index 833216bbd9..2166cbb06b 100644
--- a/lib/faker/default/vehicle.rb
+++ b/lib/faker/default/vehicle.rb
@@ -9,7 +9,7 @@ class Vehicle < Base
     VIN_LETTERS = 'ABCDEFGHJKLMNPRSTUVWXYZ'
     VIN_MAP = '0123456789X'
     VIN_WEIGHTS = '8765432X098765432'
-    VIN_REGEX = /^([A-HJ-NPR-Z0-9]){3}[A-HJ-NPR-Z0-9]{5}[A-HJ-NPR-Z0-9]{1}[A-HJ-NPR-Z0-9]{1}[A-HJ-NPR-Z0-0]{1}[A-HJ-NPR-Z0-9]{1}\d{5}$/.freeze
+    VIN_REGEX = /^([A-HJ-NPR-Z0-9]){3}[A-HJ-NPR-Z0-9]{5}[A-HJ-NPR-Z0-9]{1}[A-HJ-NPR-Z0-9]{1}[A-HJ-NPR-Z0-]{1}[A-HJ-NPR-Z0-9]{1}\d{5}$/.freeze
     SG_CHECKSUM_WEIGHTS = [3, 14, 2, 12, 2, 11, 1].freeze
     SG_CHECKSUM_CHARS = 'AYUSPLJGDBZXTRMKHEC'
 
@@ -333,7 +333,7 @@ def calculate_vin_check_digit(vin)
       end
 
       def vin_char_to_number(char)
-        index = VIN_LETTERS.split('').index(char)
+        index = VIN_LETTERS.chars.index(char)
 
         return char.to_i if index.nil?
 
@@ -341,14 +341,14 @@ def vin_char_to_number(char)
       end
 
       def singapore_checksum(plate_number)
-        padded_alphabets = format('%3s', plate_number[/^[A-Z]+/]).tr(' ', '-').split('')
-        padded_digits = format('%04d', plate_number[/\d+/]).split('').map(&:to_i)
+        padded_alphabets = format('%3s', plate_number[/^[A-Z]+/]).tr(' ', '-').chars
+        padded_digits = format('%04d', plate_number[/\d+/]).chars.map(&:to_i)
         sum = [*padded_alphabets, *padded_digits].each_with_index.reduce(0) do |memo, (char, i)|
           value = char.is_a?(Integer) ? char : char.ord - 64
           memo + (SG_CHECKSUM_WEIGHTS[i] * value)
         end
 
-        SG_CHECKSUM_CHARS.split('')[sum % 19]
+        SG_CHECKSUM_CHARS.chars[sum % 19]
       end
     end
   end
diff --git a/lib/faker/japanese_media/kamen_rider.rb b/lib/faker/japanese_media/kamen_rider.rb
index 1c2bc29150..8e8205ba12 100644
--- a/lib/faker/japanese_media/kamen_rider.rb
+++ b/lib/faker/japanese_media/kamen_rider.rb
@@ -83,14 +83,14 @@ def eras
         end
 
         def from_eras(*input_eras, field:)
-          selected_eras = (ERAS & input_eras).yield_self do |selected|
+          selected_eras = (ERAS & input_eras).then do |selected|
             selected.empty? ? eras : selected
           end.dup
           yield(selected_eras) if block_given?
 
           raise UnavailableInEra, "#{field} is unavailable in the selected eras." if selected_eras.empty?
 
-          selected_eras.sample.yield_self do |era|
+          selected_eras.sample.then do |era|
             fetch("kamen_rider.#{era}.#{field}")
           end
         end
diff --git a/lib/helpers/base58.rb b/lib/helpers/base58.rb
index 0c5a6c009d..1846593dd5 100644
--- a/lib/helpers/base58.rb
+++ b/lib/helpers/base58.rb
@@ -7,7 +7,7 @@ def self.encode(str)
       base = alphabet.size
 
       lv = 0
-      str.split('').reverse.each_with_index { |v, i| lv += v.unpack1('C') * 256**i }
+      str.chars.reverse.each_with_index { |v, i| lv += v.unpack1('C') * 256**i }
 
       ret = +''
       while lv.positive?
diff --git a/script/txt2html b/script/txt2html
index 65d207ba51..5d266cfd81 100755
--- a/script/txt2html
+++ b/script/txt2html
@@ -54,7 +54,7 @@ else
   exit!
 end
 
-template = ERB.new(File.open(template).read)
+template = ERB.new(File.read(template))
 
 title = nil
 body = nil
diff --git a/tasks/website.rake b/tasks/website.rake
index 7c186abf97..f7281bb5d3 100644
--- a/tasks/website.rake
+++ b/tasks/website.rake
@@ -11,7 +11,7 @@ desc 'Upload website files to rubyforge'
 task :website_upload do
   remote_dir = '/var/www/gforge-projects/faker/'
   local_dir = 'website'
-  sh %(rsync -acCv #{local_dir}/ #{ENV['USER']}@rubyforge.org:#{remote_dir})
+  sh %(rsync -acCv #{local_dir}/ #{ENV.fetch('USER', nil)}@rubyforge.org:#{remote_dir})
 end
 
 desc 'Generate and upload website files'
diff --git a/test/faker/default/test_alphanum.rb b/test/faker/default/test_alphanum.rb
index 33b066945b..7910421ada 100644
--- a/test/faker/default/test_alphanum.rb
+++ b/test/faker/default/test_alphanum.rb
@@ -34,14 +34,14 @@ def test_alphanumeric_with_invalid_mins
   end
 
   def test_alphanumeric_with_min_alpha
-    letters = @tester.alphanumeric(number: 5, min_alpha: 2).split('').map do |char|
+    letters = @tester.alphanumeric(number: 5, min_alpha: 2).chars.map do |char|
       char =~ /[[:alpha:]]/
     end
     assert letters.compact.size >= 2
   end
 
   def test_alphanumeric_with_min_numeric
-    numbers = @tester.alphanumeric(number: 5, min_numeric: 4).split('').map do |char|
+    numbers = @tester.alphanumeric(number: 5, min_numeric: 4).chars.map do |char|
       char =~ /[[:digit:]]/
     end
     assert numbers.compact.size >= 4
diff --git a/test/faker/default/test_faker_company.rb b/test/faker/default/test_faker_company.rb
index 0d4581b1fd..fdebefc129 100644
--- a/test/faker/default/test_faker_company.rb
+++ b/test/faker/default/test_faker_company.rb
@@ -201,7 +201,7 @@ def test_russian_tax_number_region
   def test_russian_tax_number_checksum
     base_number = @tester.russian_tax_number
     number = base_number[0..-2]
-    checksum = base_number.split('').last.to_i
+    checksum = base_number.chars.last.to_i
 
     assert((inn_checksum(number) - checksum).zero?)
   end
@@ -240,7 +240,7 @@ def test_spanish_b_algorithm
   def czech_o_n_checksum(org_no)
     weights = [8, 7, 6, 5, 4, 3, 2]
     sum = 0
-    digits = org_no.split('').map(&:to_i)
+    digits = org_no.chars.map(&:to_i)
     weights.each_with_index.map do |w, i|
       sum += (w * digits[i])
     end
@@ -250,7 +250,7 @@ def czech_o_n_checksum(org_no)
   def abn_checksum(abn)
     abn_weights = [10, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19]
 
-    abn.split('').map(&:to_i).each_with_index.map do |n, i|
+    abn.chars.map(&:to_i).each_with_index.map do |n, i|
       (i.zero? ? n - 1 : n) * abn_weights[i]
     end.inject(:+)
   end
@@ -282,7 +282,7 @@ def cif_valid?(cif)
       province_code = number[0..1]
       actual_control = Regexp.last_match(3)
 
-      total = number.split('').each_with_index.inject(0) do |acc, (element, index)|
+      total = number.chars.each_with_index.inject(0) do |acc, (element, index)|
         acc + if index.even?
                 (element.to_i * 2).digits.inject(:+)
               else
@@ -291,7 +291,7 @@ def cif_valid?(cif)
       end
 
       decimal = total.digits.first
-      expected_control = decimal != 0 ? 10 - decimal : decimal
+      expected_control = decimal.zero? ? decimal : 10 - decimal
 
       # Control code must be a letter
       return letters_cif_control[expected_control] if letter_cif_number.include?(first_letter) ||
diff --git a/test/faker/default/test_faker_food.rb b/test/faker/default/test_faker_food.rb
index f7ab9e7dbf..ea10f82866 100644
--- a/test/faker/default/test_faker_food.rb
+++ b/test/faker/default/test_faker_food.rb
@@ -40,7 +40,7 @@ def test_sushi
   end
 
   def test_measurement
-    assert @tester.measurement.split(' ').length == 2
+    assert @tester.measurement.split.length == 2
   end
 
   def test_metric_measurement
diff --git a/test/faker/default/test_faker_lorem.rb b/test/faker/default/test_faker_lorem.rb
index 407fa3d3d2..26d092851d 100644
--- a/test/faker/default/test_faker_lorem.rb
+++ b/test/faker/default/test_faker_lorem.rb
@@ -52,7 +52,7 @@ def test_word
   end
 
   def test_exact_sentence_word_count
-    assert_equal 2, @tester.sentence(word_count: 2, supplemental: false, random_words_to_add: 0).split(' ').length
+    assert_equal 2, @tester.sentence(word_count: 2, supplemental: false, random_words_to_add: 0).split.length
   end
 
   def test_exact_count_param
diff --git a/test/faker/default/test_faker_markdown.rb b/test/faker/default/test_faker_markdown.rb
index 3271b97045..982c0263af 100644
--- a/test/faker/default/test_faker_markdown.rb
+++ b/test/faker/default/test_faker_markdown.rb
@@ -9,14 +9,14 @@ def setup
   end
 
   def test_headers
-    test_trigger = @tester.headers.split(' ')
+    test_trigger = @tester.headers.split
 
     assert(test_trigger.length == 2)
     assert(test_trigger.first.include?('#'))
   end
 
   def test_emphasis
-    test_trigger = @tester.emphasis.split('')
+    test_trigger = @tester.emphasis.chars
 
     assert(test_trigger.to_set.intersect?(['_', '~', '*', '**'].to_set))
   end
@@ -38,14 +38,14 @@ def test_unordered_list
   end
 
   def test_inline_code
-    test_trigger = @tester.inline_code.split('')
+    test_trigger = @tester.inline_code.chars
 
     assert_equal(test_trigger.first, '`')
     assert_equal(test_trigger.last, '`')
   end
 
   def test_block_code
-    test_trigger = @tester.block_code.split('')
+    test_trigger = @tester.block_code.chars
 
     assert_equal(test_trigger[0], '`')
     assert_equal(test_trigger[1], '`')
@@ -88,8 +88,8 @@ def test_sandwich
 
     assert(test_array.length >= 3)
 
-    assert(test_array[0].split(' ').length == 2)
-    assert(test_array[0].split(' ').first.include?('#'))
+    assert(test_array[0].split.length == 2)
+    assert(test_array[0].split.first.include?('#'))
 
     assert_instance_of(String, test_array[0])
     assert_instance_of(String, test_array[1])
diff --git a/test/faker/default/test_faker_omniauth.rb b/test/faker/default/test_faker_omniauth.rb
index 39484ad171..10d4a05f3d 100644
--- a/test/faker/default/test_faker_omniauth.rb
+++ b/test/faker/default/test_faker_omniauth.rb
@@ -21,8 +21,8 @@ def test_omniauth_google
     assert_equal 9, auth[:uid].length
     assert_equal 2, word_count(info[:name])
     assert info[:email].match safe_email_regex(info[:first_name], info[:last_name])
-    assert_equal info[:name].split(' ').first, info[:first_name]
-    assert_equal info[:name].split(' ').last, info[:last_name]
+    assert_equal info[:name].split.first, info[:first_name]
+    assert_equal info[:name].split.last, info[:last_name]
     assert_instance_of String, info[:image]
     assert_instance_of String, credentials[:token]
     assert_instance_of String, credentials[:refresh_token]
@@ -507,8 +507,8 @@ def test_omniauth_auth0
     extra           = auth[:extra]
     raw_info        = extra[:raw_info]
     nick_name       = info[:nickname].downcase
-    first_name      = nick_name.split(' ').first
-    last_name       = nick_name.split(' ').last
+    first_name      = nick_name.split.first
+    last_name       = nick_name.split.last
 
     assert_equal 'auth0', auth[:provider]
     assert_instance_of String, auth[:uid]
@@ -535,7 +535,7 @@ def test_omniauth_auth0
   end
 
   def word_count(string)
-    string.split(' ').length
+    string.split.length
   end
 
   def boolean?(test)
diff --git a/test/faker/default/test_faker_tea.rb b/test/faker/default/test_faker_tea.rb
index 1e2e6cc36f..93b0ced6fd 100644
--- a/test/faker/default/test_faker_tea.rb
+++ b/test/faker/default/test_faker_tea.rb
@@ -6,9 +6,9 @@ class TestFakerTea < Test::Unit::TestCase
   def setup
     @tester = Faker::Tea
     @types = Faker::Base.fetch_all('tea.type')
-    @varieties_by_type = @types.map do |type|
+    @varieties_by_type = @types.to_h do |type|
       [type, Faker::Base.fetch_all("tea.variety.#{type.downcase}")]
-    end.to_h
+    end
     @varieties = @varieties_by_type.values.flatten
   end
 
diff --git a/test/faker/default/test_faker_types.rb b/test/faker/default/test_faker_types.rb
index 769e97c5ae..e017b16b22 100644
--- a/test/faker/default/test_faker_types.rb
+++ b/test/faker/default/test_faker_types.rb
@@ -15,9 +15,9 @@ def test_rb_string_is_or_correct_type
   end
 
   def test_string_returns_correct_number_of_words
-    assert @tester.rb_string(words: 1).split(' ').length == 1
-    assert @tester.rb_string(words: 5).split(' ').length == 5
-    assert @tester.rb_string(words: 0).split(' ').empty?
+    assert @tester.rb_string(words: 1).split.length == 1
+    assert @tester.rb_string(words: 5).split.length == 5
+    assert @tester.rb_string(words: 0).split.empty?
   end
 
   def test_character
diff --git a/test/test_en_gb_locale.rb b/test/test_en_gb_locale.rb
index 8c3eac0eea..8e1363f311 100644
--- a/test/test_en_gb_locale.rb
+++ b/test/test_en_gb_locale.rb
@@ -43,17 +43,17 @@ def test_en_gb_cell_phone_is_valid
 
   def test_en_gb_postcode_has_outcode_and_incode
     postcode = Faker::Address.postcode
-    assert_equal 2, postcode.split(' ').length
+    assert_equal 2, postcode.split.length
   end
 
   def test_en_gb_postcode_incode_is_valid
     # The letters C I K M O V are not used in the second part of the Postcode.
-    incode = Faker::Address.postcode.split(' ')[1]
+    incode = Faker::Address.postcode.split[1]
     assert_match(/\d[ABDEFGHJLNPQRSTUWXYZ]{2}/, incode)
   end
 
   def test_en_gb_postcode_outcode_is_valid
-    outcode = Faker::Address.postcode.split(' ')[0]
+    outcode = Faker::Address.postcode.split[0]
     assert_includes(2..4, outcode.length)
     assert_match(/\w{1,2}\d{1,2}\w?/, outcode)
     assert_match(/^[A-PR-UWYZ][A-HK-Y0-9]/, outcode)
diff --git a/test/test_es_ar_locale.rb b/test/test_es_ar_locale.rb
index f0d5c7b01a..2f3ccd973e 100644
--- a/test/test_es_ar_locale.rb
+++ b/test/test_es_ar_locale.rb
@@ -278,7 +278,7 @@ def test_es_ar_phone_number
   end
 
   def test_es_ar_cell_phone
-    assert Faker::PhoneNumber.cell_phone.match(/^(?:11|(?:2|3)\d{2,3})(?:\-| )(?:4|5|6|7)(?:\d{3}(?:-| )\d{4}|\d{2}(?:-| )\d{4}|\d{5})$/u)
+    assert Faker::PhoneNumber.cell_phone.match(/^(?:11|(?:2|3)\d{2,3})(?:-| )(?:4|5|6|7)(?:\d{3}(?:-| )\d{4}|\d{2}(?:-| )\d{4}|\d{5})$/u)
   end
 
   def test_es_ar_country_code
@@ -290,7 +290,7 @@ def test_es_ar_phone_number_with_country_code
   end
 
   def test_es_ar_cell_phone_with_country_code
-    assert Faker::PhoneNumber.cell_phone_with_country_code.match(/^\+54 (?:11|(?:2|3)\d{2,3})(?:\-| )(?:4|5|6|7)(?:\d{3}(?:-| )\d{4}|\d{2}(?:-| )\d{4}|\d{5})$/u)
+    assert Faker::PhoneNumber.cell_phone_with_country_code.match(/^\+54 (?:11|(?:2|3)\d{2,3})(?:-| )(?:4|5|6|7)(?:\d{3}(?:-| )\d{4}|\d{2}(?:-| )\d{4}|\d{5})$/u)
   end
 
   def test_es_ar_cell_phone_in_e164