ffaker 2.22.0 → 2.24.0

data/test/test_bank_us.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class TestBankUS < Test::Unit::TestCase
+  include DeterministicHelper
+
+  assert_methods_are_deterministic(
+    FFaker::BankUS,
+    :account_number, :routing_number
+  )
+
+  def setup
+    @tester = FFaker::BankUS
+  end
+
+  def test_account_number
+    assert_instance_of String, @tester.account_number
+    assert_match(/\A\d{8}\z/, @tester.account_number(min_digits: 8, max_digits: 8))
+    assert_match(/\A\d{12}\z/, @tester.account_number(min_digits: 12, max_digits: 12))
+  end
+
+  def test_routing_number
+    routing_number = @tester.routing_number
+    assert_match(/\A\d{9}\z/, routing_number)
+
+    assert_true(@tester::ROUTING_NUMBER_PREFIXES.include?(routing_number[0..1]))
+
+    checksum = (
+      (7 * (routing_number[0].to_i + routing_number[3].to_i + routing_number[6].to_i)) +
+        (3 * (routing_number[1].to_i + routing_number[4].to_i + routing_number[7].to_i)) +
+        (9 * (routing_number[2].to_i + routing_number[5].to_i + routing_number[8].to_i))
+    )
+
+    assert_equal(0, checksum % 10, 'The routing number\'s checksum is not a multiple of ten')
+  end
+end

data/test/test_book.rb

@@ -39,6 +39,35 @@ class TestBook < Test::Unit::TestCase
                  @tester.cover)
   end
 
+  def test_cover_with_format
+    assert_match(%r{\Ahttps://robohash\.org/.+\.jpg\?size=300x300\z},
+                 @tester.cover(format: 'jpg'))
+  end
+
+  def test_cover_output_with_keyword_arguments
+    output = capture_output do
+      @tester.cover(format: 'jpg')
+    end
+
+    assert_equal ['', ''], output
+  end
+
+  def test_cover_with_slug_as_positional_argument
+    assert_match(%r{\Ahttps://robohash\.org/foobar\.png\?size=300x300\z},
+                 @tester.cover('foobar'))
+  end
+
+  def test_cover_output_with_positional_arguments
+    output = capture_output do
+      @tester.cover('foobar')
+    end
+
+    assert_equal(
+      ['', "Positional arguments for Book#cover are deprecated. Please use keyword arguments.\n"],
+      output
+    )
+  end
+
   def test_orly_cover
     assert_match(%r{\Ahttps://orly-appstore\.herokuapp\.com/generate},
                  @tester.orly_cover)

data/test/test_crypto.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class TestCrypto < Test::Unit::TestCase
+  include DeterministicHelper
+
+  assert_methods_are_deterministic(FFaker::Crypto, :sha256)
+
+  def test_sha256
+    assert FFaker::Crypto.sha256.is_a?(String)
+    assert FFaker::Crypto.sha256.length == 64
+    assert_match(/\A[a-z\d]{64}\z/, FFaker::Crypto.sha256)
+  end
+end

data/test/test_date.rb

@@ -9,7 +9,7 @@ class TestFakerDate < Test::Unit::TestCase
     @tester = FFaker::Date
   end
 
-  assert_methods_are_deterministic(FFaker::Date, :backward, :forward)
+  assert_methods_are_deterministic(FFaker::Date, :backward, :forward, :birthday)
 
   def test_between
     from = Date.new(2015, 1, 1)
@@ -34,4 +34,14 @@ class TestFakerDate < Test::Unit::TestCase
     assert_random_between(today + 1..today + 30) { @tester.forward(30) }
     assert_instance_of Date, @tester.forward
   end
+
+  def test_birthday
+    today = Date.today
+
+    assert_random_between(today.prev_year(65).next_day..today.prev_year(18)) { @tester.birthday }
+    assert_random_between(today.prev_year(43).next_day..today.prev_year(42)) do
+      @tester.birthday(min_age: 42, max_age: 42)
+    end
+    assert_instance_of Date, @tester.birthday
+  end
 end

data/test/test_filesystem.rb

@@ -30,7 +30,33 @@ class TestFakerFilesystem < Test::Unit::TestCase
   end
 
   def test_file_name
-    assert_match %r{\A(?:[a-z_-]+[\\/])+[a-z_-]+\.\w{2,4}\z},
-                 @tester.file_name
+    assert_match %r{\A(?:[a-z_-]+[\\/])+[a-z_-]+\.\w{2,4}\z}, @tester.file_name
+  end
+
+  def test_file_name_with_extension
+    assert_match %r{\A(?:[a-z_-]+[\\/])+[a-z_-]+\.rb\z}, @tester.file_name(ext: 'rb')
+  end
+
+  def test_file_name_output_with_keyword_arguments
+    output = capture_output do
+      @tester.file_name(ext: 'rb')
+    end
+
+    assert_equal ['', ''], output
+  end
+
+  def test_file_name_with_directory_as_positional_argument
+    assert_match %r{\Asome_directory/[a-z_-]+\.\w{2,4}\z}, @tester.file_name('some_directory')
+  end
+
+  def test_file_name_output_with_positional_arguments
+    output = capture_output do
+      @tester.file_name('some_directory')
+    end
+
+    assert_equal(
+      ['', "Positional arguments for Filesystem#file_name are deprecated. Please use keyword arguments.\n"],
+      output
+    )
   end
 end

data/test/test_guid.rb

@@ -8,7 +8,7 @@ class TestGuid < Test::Unit::TestCase
   assert_methods_are_deterministic(FFaker::Guid, :guid)
 
   def test_guid
-    assert_match(/[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}/,
+    assert_match(/\A[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/,
                  FFaker::Guid.guid)
   end
 end

data/test/test_healthcare_ru.rb

@@ -5,7 +5,7 @@ require_relative 'helper'
 class TestHealthcareRU < Test::Unit::TestCase
   include DeterministicHelper
 
-  SPECIALIZATION_REGEX = /\A[А-Яа-я\ ()\-]+\z/
+  SPECIALIZATION_REGEX = /\A[А-Яа-я\ ()-]+\z/
 
   assert_methods_are_deterministic(FFaker::HealthcareRU, :doctor_specialization)
 

data/test/test_identification.rb

@@ -15,7 +15,6 @@ class TestFakerIdentification < Test::Unit::TestCase
   end
 
   def test_drivers_license
-    ###-###-##-###-#
     drivers_license_regex = /\A[A-Z]\d{3}-\d{3}-\d{2}-\d{3}-\d{1}\z/
     assert_match(drivers_license_regex, @tester.drivers_license)
   end
@@ -29,7 +28,18 @@ class TestFakerIdentification < Test::Unit::TestCase
   end
 
   def test_ethnicity
-    ethnicity_regex = %r{\A(African American|Asian/Pacific Islander|Caucasian|Hispanic|Native American|Multiracial|Other|Prefer not to respond)\z}
+    ethnicity_regex = %r{
+      \A(
+        African\ American|
+        Asian/Pacific\ Islander|
+        Caucasian|
+        Hispanic|
+        Native\ American|
+        Multiracial|
+        Other|
+        Prefer\ not\ to\ respond
+      )\z
+    }x
     assert_match(ethnicity_regex, @tester.ethnicity)
   end
 end

data/test/test_identification_ec.rb

@@ -27,7 +27,7 @@ class TestIdentificationEC < Test::Unit::TestCase
       end
     end
     mod = sum % 10
-    mod = 10 - mod if mod > 0
+    mod = 10 - mod if mod.positive?
     assert(ci[9].to_i == mod)
   end
 end

data/test/test_identification_es_mx.rb

@@ -22,7 +22,9 @@ class TestIdentificationMX < Test::Unit::TestCase
 
   def test_curp
     or_curp_states_abbr = FFaker::IdentificationMX::ESTADOS_CURP.join('|')
-    re = /\A[a-z][aeioux][a-z]{2}\d{2}[0-1]\d[0-3]\d[hm](?:#{or_curp_states_abbr})[bcdfghjklmñpqrstvwxyz]{3}[0-9a-z]\d\z/ui
+    re = /
+      \A[a-z][aeioux][a-z]{2}\d{2}[0-1]\d[0-3]\d[hm](?:#{or_curp_states_abbr})[bcdfghjklmñpqrstvwxyz]{3}[0-9a-z]\d\z
+    /uix
     assert_match(re, FFaker::IdentificationMX.curp)
   end
 end

data/test/test_identification_it.rb

@@ -28,7 +28,18 @@ class TestFakerIdentificationIT < Test::Unit::TestCase
   end
 
   def test_ethnicity
-    ethnicity_regex = %r{\A(Afroamericano|Asiatico/isolano del Pacifico|Caucasico|Ispanico|Nativo americano|Multirazziale|Altro|Preferisco non rispondere)\z}
+    ethnicity_regex = %r{
+      \A(
+        Afroamericano|
+        Asiatico/isolano\ del\ Pacifico|
+        Caucasico|
+        Ispanico|
+        Nativo\ americano|
+        Multirazziale|
+        Altro|
+        Preferisco\ non\ rispondere
+      )\z
+    }x
     assert_match(ethnicity_regex, @tester.ethnicity)
   end
 end

data/test/test_identification_kr.rb

@@ -2,13 +2,13 @@
 
 require_relative 'helper'
 
-class TestFakerIdentificationKr < Test::Unit::TestCase
+class TestFakerIdentificationKR < Test::Unit::TestCase
   include DeterministicHelper
 
-  assert_methods_are_deterministic(FFaker::IdentificationKr, :rrn)
+  assert_methods_are_deterministic(FFaker::IdentificationKR, :rrn)
 
   def setup
-    @tester = FFaker::IdentificationKr
+    @tester = FFaker::IdentificationKR
   end
 
   def test_rrn

data/test/test_image.rb

@@ -18,34 +18,80 @@ class TestImage < Test::Unit::TestCase
                  @tester.url)
   end
 
+  def test_url_output_with_keyword_arguments
+    output = capture_output do
+      @tester.url(format: 'jpg')
+    end
+
+    assert_equal ['', ''], output
+  end
+
+  def test_url_with_size_as_positional_argument
+    assert_match(%r(#{Regexp.quote(PLACEHOLDER)}150x320/[0-9a-f]{6}/[0-9a-f]{6}\.png\?text=), @tester.url('150x320'))
+  end
+
+  def test_url_output_with_positional_arguments
+    output = capture_output do
+      @tester.url('150x320')
+    end
+
+    assert_equal(
+      ['', "Positional arguments for Image#url are deprecated. Please use keyword arguments.\n"],
+      output
+    )
+  end
+
   def test_image_url_with_param
     assert_equal("#{PLACEHOLDER}300x300//.png?text=",
-                 @tester.url('300x300', 'png', nil, nil))
+                 @tester.url(size: '300x300', format: 'png', bg_color: nil, text_color: nil))
   end
 
   def test_image_url_with_correct_size
     assert_match(%r(#{Regexp.quote(PLACEHOLDER)}150x320/[0-9a-f]{6}/[0-9a-f]{6}\.png\?text=),
-                 @tester.url('150x320'))
+                 @tester.url(size: '150x320'))
   end
 
   def test_image_url_with_incorrect_size
     assert_raise ArgumentError do
-      @tester.url('150x320z')
+      @tester.url(size: '150x320z')
     end
   end
 
   def test_image_url_with_supported_format
     assert_match(%r(#{Regexp.quote(PLACEHOLDER)}300x300/[0-9a-f]{6}/[0-9a-f]{6}\.jpg\?text=),
-                 @tester.url('300x300', 'jpg'))
+                 @tester.url(size: '300x300', format: 'jpg'))
   end
 
   def test_image_url_with_incorrect_format
     assert_raise ArgumentError do
-      @tester.url('300x300', 'wrong_format')
+      @tester.url(size: '300x300', format: 'wrong_format')
     end
   end
 
   def test_image_file
     assert_equal(@tester.file.class.name, 'File')
   end
+
+  def test_file_output_with_keyword_arguments
+    output = capture_output do
+      @tester.file(format: 'jpg')
+    end
+
+    assert_equal ['', ''], output
+  end
+
+  def test_file_with_size_as_positional_argument
+    assert_equal(@tester.file('150x320').class.name, 'File')
+  end
+
+  def test_file_output_with_positional_arguments
+    output = capture_output do
+      @tester.file('150x320')
+    end
+
+    assert_equal(
+      ['', "Positional arguments for Image#file are deprecated. Please use keyword arguments.\n"],
+      output
+    )
+  end
 end

data/test/test_internet.rb

@@ -29,7 +29,9 @@ class TestFakerInternet < Test::Unit::TestCase
   end
 
   def test_disposable_email
-    assert @tester.disposable_email.match(/.+@(mailinator\.com|suremail\.info|spamherelots\.com|binkmail\.com|safetymail\.info)/)
+    assert @tester.disposable_email.match(
+      /.+@(mailinator\.com|suremail\.info|spamherelots\.com|binkmail\.com|safetymail\.info)/
+    )
   end
 
   def test_safe_email

data/test/test_internet_se.rb

@@ -25,7 +25,9 @@ class TestFakerInternetSE < Test::Unit::TestCase
   end
 
   def test_disposable_email
-    assert @tester.disposable_email.match(/.+@(mailinator\.com|suremail\.info|spamherelots\.com|binkmail\.com|safetymail\.info)/)
+    assert @tester.disposable_email.match(
+      /.+@(mailinator\.com|suremail\.info|spamherelots\.com|binkmail\.com|safetymail\.info)/
+    )
   end
 
   def test_free_email

data/test/test_lorem_br.rb

@@ -12,7 +12,7 @@ class TestLoremBR < Test::Unit::TestCase
 
   CHARACTERS = /\A[A-zÀ-ü0-9]+\z/i
   WORD = /\A[A-zÀ-ü-]+\z/i
-  WORDS = /[ A-zÀ-ü-.]+/i
+  WORDS = /[ A-zÀ-ü\-.]+/i
 
   def test_paragraph
     assert_match(WORDS, FFaker::LoremBR.paragraph)

data/test/test_lorem_ru.rb

@@ -7,7 +7,7 @@ class TestLoremRU < Test::Unit::TestCase
 
   SENTENCE_MATCHER = /\A[а-яА-ЯёЁ\-\s.!?,]+\z/
   WORDS_MATCHER    = /\A[А-Яа-яёЁ\-\s]+\z/
-  WORD_MATCHER     = /\A[А-Яа-яёЁ\-]+\z/
+  WORD_MATCHER     = /\A[А-Яа-яёЁ-]+\z/
 
   assert_methods_are_deterministic(
     FFaker::LoremRU,

data/test/test_lorem_ua.rb

@@ -7,7 +7,7 @@ class TestLoremUA < Test::Unit::TestCase
 
   SENTENCE_MATCHER = /\A[а-яА-ЯіїєґІЇЄҐ’\-\s.!?,]+\z/
   WORDS_MATCHER    = /\A[а-яА-ЯіїєґІЇЄҐ’\-\s]+\z/
-  WORD_MATCHER     = /\A[а-яА-ЯіїєґІЇЄҐ’\-]+\z/
+  WORD_MATCHER     = /\A[а-яА-ЯіїєґІЇЄҐ’-]+\z/
 
   assert_methods_are_deterministic(
     FFaker::LoremUA,

data/test/test_module_utils.rb

@@ -44,4 +44,13 @@ class TestModuleUtils < Test::Unit::TestCase
     FFaker::UniqueUtils.clear
     generator.unique.test
   end
+
+  def test_luhn_check
+    obj = Object.new
+    obj.extend FFaker::ModuleUtils
+    assert obj.luhn_check('97248708') == '6'
+    assert obj.luhn_check('1789372997') == '4'
+    assert obj.luhn_check('8899982700037') == '1'
+    assert obj.luhn_check('1234567820001') == '0'
+  end
 end

data/test/test_name_ua.rb

@@ -15,7 +15,7 @@ class TestNameUA < Test::Unit::TestCase
   def setup
     @tester = FFaker::NameUA
 
-    @single_word_name_regexp    = /\A[а-яА-ЯіїєґІЇЄҐ’\-]+\z/
+    @single_word_name_regexp    = /\A[а-яА-ЯіїєґІЇЄҐ’-]+\z/
     @multiple_words_name_regexp = /\A[а-яА-ЯіїєґІЇЄҐ’\-\s]+\z/
   end
 

data/test/test_number.rb

@@ -5,7 +5,7 @@ require_relative 'helper'
 class TestNumber < Test::Unit::TestCase
   include DeterministicHelper
 
-  assert_methods_are_deterministic(FFaker::Number, :number, :decimal)
+  assert_methods_are_deterministic(FFaker::Number, :number, :decimal, :between)
 
   def setup
     @tester = FFaker::Number
@@ -42,4 +42,16 @@ class TestNumber < Test::Unit::TestCase
       @tester.decimal(fractional_digits: 0)
     end
   end
+
+  def test_between
+    from = -50
+    to = 50
+    assert_random_between(from..to) { @tester.between(from: from, to: to) }
+    assert_instance_of Integer, @tester.between(from: from, to: to)
+
+    from = -50.0
+    to = 50.0
+    assert_random_between(from..to) { @tester.between(from: from, to: to) }
+    assert_instance_of Float, @tester.between(from: from, to: to)
+  end
 end

data/test/test_phone_number_nl.rb

@@ -24,7 +24,7 @@ class TestPhoneNumberNL < Test::Unit::TestCase
 
   def test_phone_number
     10.times do
-      assert_match(/^0([\s\-]*\d){9}$/, @tester.phone_number)
+      assert_match(/^0([\s-]*\d){9}$/, @tester.phone_number)
     end
   end
 

data/test/test_unique_utils.rb

@@ -71,4 +71,8 @@ class TestUniqueUtils < Test::Unit::TestCase
       assert_equal(1, tested_unique_object.test)
     end
   end
+
+  def test_generates_unique_numbers
+    assert_nothing_raised { FFaker::Number.unique.number(digits: 1) }
+  end
 end

data/test/test_units.rb

@@ -13,25 +13,25 @@ class TestUnits < Test::Unit::TestCase
 
   def setup
     @tester = FFaker::Unit
-    @time_units = @tester::TIME_UNITS.map { |u| OpenStruct.new u }
-    @temperature_units = @tester::TEMPERATURE_UNITS.map { |u| OpenStruct.new u }
+    @time_units = @tester::TIME_UNITS
+    @temperature_units = @tester::TEMPERATURE_UNITS
   end
 
   def test_time_name
-    assert_include @time_units.map(&:name), @tester.time_name
+    assert_include @time_units.map { |unit| unit[:name] }, @tester.time_name
   end
 
   def test_time_abbr
-    assert_include @time_units.map(&:abbreviation), @tester.time_abbr
+    assert_include @time_units.map { |unit| unit[:abbreviation] }, @tester.time_abbr
   end
 
   def test_temperature_name
-    assert_include @temperature_units.map(&:name), @tester.temperature_name
+    assert_include @temperature_units.map { |unit| unit[:name] }, @tester.temperature_name
   end
 
   def test_temperature_abbr
     assert_include \
-      @temperature_units.map(&:abbreviation),
+      @temperature_units.map { |unit| unit[:abbreviation] },
       @tester.temperature_abbr
   end
 end

data/test/test_units_english.rb

@@ -14,50 +14,50 @@ class TestUnitsEnglish < Test::Unit::TestCase
 
   def setup
     @tester = FFaker::UnitEnglish
-    @length_units = @tester::LENGTH_UNITS.map { |u| OpenStruct.new u }
-    @mass_units = @tester::MASS_UNITS.map { |u| OpenStruct.new u }
-    @liquid_units = @tester::LIQUID_UNITS.map { |u| OpenStruct.new u }
-    @volume_units = @tester::VOLUME_UNITS.map { |u| OpenStruct.new u }
-    @area_units = @tester::AREA_UNITS.map { |u| OpenStruct.new u }
+    @length_units = @tester::LENGTH_UNITS
+    @mass_units = @tester::MASS_UNITS
+    @liquid_units = @tester::LIQUID_UNITS
+    @volume_units = @tester::VOLUME_UNITS
+    @area_units = @tester::AREA_UNITS
   end
 
   def test_length_name
-    assert_include @length_units.map(&:name), @tester.length_name
+    assert_include @length_units.map { |unit| unit[:name] }, @tester.length_name
   end
 
   def test_length_abbrev
-    assert_include @length_units.map(&:abbreviation), @tester.length_abbr
+    assert_include @length_units.map { |unit| unit[:abbreviation] }, @tester.length_abbr
   end
 
   def test_mass_name
-    assert_include @mass_units.map(&:name), @tester.mass_name
+    assert_include @mass_units.map { |unit| unit[:name] }, @tester.mass_name
   end
 
   def test_mass_abbr
-    assert_include @mass_units.map(&:abbreviation), @tester.mass_abbr
+    assert_include @mass_units.map { |unit| unit[:abbreviation] }, @tester.mass_abbr
   end
 
   def test_liquid_name
-    assert_include @liquid_units.map(&:name), @tester.liquid_name
+    assert_include @liquid_units.map { |unit| unit[:name] }, @tester.liquid_name
   end
 
   def test_liquid_abbr
-    assert_include @liquid_units.map(&:abbreviation), @tester.liquid_abbr
+    assert_include @liquid_units.map { |unit| unit[:abbreviation] }, @tester.liquid_abbr
   end
 
   def test_volume_name
-    assert_include @volume_units.map(&:name), @tester.volume_name
+    assert_include @volume_units.map { |unit| unit[:name] }, @tester.volume_name
   end
 
   def test_volume_abbr
-    assert_include @volume_units.map(&:abbreviation), @tester.volume_abbr
+    assert_include @volume_units.map { |unit| unit[:abbreviation] }, @tester.volume_abbr
   end
 
   def test_area_name
-    assert_include @area_units.map(&:name), @tester.area_name
+    assert_include @area_units.map { |unit| unit[:name] }, @tester.area_name
   end
 
   def test_area_abbr
-    assert_include @area_units.map(&:abbreviation), @tester.area_abbr
+    assert_include @area_units.map { |unit| unit[:abbreviation] }, @tester.area_abbr
   end
 end

data/test/test_units_metric.rb

@@ -14,50 +14,50 @@ class TestUnitsMetric < Test::Unit::TestCase
 
   def setup
     @tester = FFaker::UnitMetric
-    @length_units = @tester::LENGTH_UNITS.map { |u| OpenStruct.new u }
-    @mass_units = @tester::MASS_UNITS.map { |u| OpenStruct.new u }
-    @liquid_units = @tester::LIQUID_UNITS.map { |u| OpenStruct.new u }
-    @volume_units = @tester::VOLUME_UNITS.map { |u| OpenStruct.new u }
-    @area_units = @tester::AREA_UNITS.map { |u| OpenStruct.new u }
+    @length_units = @tester::LENGTH_UNITS
+    @mass_units = @tester::MASS_UNITS
+    @liquid_units = @tester::LIQUID_UNITS
+    @volume_units = @tester::VOLUME_UNITS
+    @area_units = @tester::AREA_UNITS
   end
 
   def test_length_name
-    assert_include @length_units.map(&:name), @tester.length_name
+    assert_include @length_units.map { |unit| unit[:name] }, @tester.length_name
   end
 
   def test_length_abbrev
-    assert_include @length_units.map(&:abbreviation), @tester.length_abbr
+    assert_include @length_units.map { |unit| unit[:abbreviation] }, @tester.length_abbr
   end
 
   def test_mass_name
-    assert_include @mass_units.map(&:name), @tester.mass_name
+    assert_include @mass_units.map { |unit| unit[:name] }, @tester.mass_name
   end
 
   def test_mass_abbr
-    assert_include @mass_units.map(&:abbreviation), @tester.mass_abbr
+    assert_include @mass_units.map { |unit| unit[:abbreviation] }, @tester.mass_abbr
   end
 
   def test_liquid_name
-    assert_include @liquid_units.map(&:name), @tester.liquid_name
+    assert_include @liquid_units.map { |unit| unit[:name] }, @tester.liquid_name
   end
 
   def test_liquid_abbr
-    assert_include @liquid_units.map(&:abbreviation), @tester.liquid_abbr
+    assert_include @liquid_units.map { |unit| unit[:abbreviation] }, @tester.liquid_abbr
   end
 
   def test_volume_name
-    assert_include @volume_units.map(&:name), @tester.volume_name
+    assert_include @volume_units.map { |unit| unit[:name] }, @tester.volume_name
   end
 
   def test_volume_abbr
-    assert_include @volume_units.map(&:abbreviation), @tester.volume_abbr
+    assert_include @volume_units.map { |unit| unit[:abbreviation] }, @tester.volume_abbr
   end
 
   def test_area_name
-    assert_include @area_units.map(&:name), @tester.area_name
+    assert_include @area_units.map { |unit| unit[:name] }, @tester.area_name
   end
 
   def test_area_abbr
-    assert_include @area_units.map(&:abbreviation), @tester.area_abbr
+    assert_include @area_units.map { |unit| unit[:abbreviation] }, @tester.area_abbr
   end
 end