Simpler test_helper requires (#1294)

Without this, running a single test file via `bundle exec ruby test/test_flexible.rb` was not working for me.
faker-ruby · Jun 25, 2018 · 38f0436 · 38f0436
1 parent babfa4f
commit 38f0436
Show file tree

Hide file tree

Showing 191 changed files with 191 additions and 190 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -103,6 +103,7 @@
 - [PR #1173](https://github.com/stympy/faker/pull/1173) Fix tests warning [@vbrazo](https://github.com/vbrazo)
 
 ### Chores
+- [PR #1294](https://github.com/stympy/faker/pull/1294) Simpler requiring of test helper [@deivid-rodriguez](https://github.com/deivid-rodriguez)
 - [PR #1288](https://github.com/stympy/faker/pull/1288) rake console changes - description and contributing.md [@MarcPer](https://github.com/MarcPer)
 - [PR #719](https://github.com/stympy/faker/pull/719) Random words to add should be 0 [@swapsCAPS](https://github.com/swapsCAPS)
 

diff --git a/test/test_array_sample_method_compat.rb b/test/test_array_sample_method_compat.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require_relative 'test_helper'
 
 # when these tests are run under Ruby 1.8.7, they will use the
 # self-defined Array#sample method in lib/extensions/array and will test whether it

diff --git a/test/test_avatar.rb b/test/test_avatar.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerAvatar < Test::Unit::TestCase
   def setup

diff --git a/test/test_bg_locale.rb b/test/test_bg_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestBgLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_ca_cat_locale.rb b/test/test_ca_cat_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestCaCatLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_ca_locale.rb b/test/test_ca_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestCaLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_country_code.rb b/test/test_country_code.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestCountryCode < Test::Unit::TestCase
   def setup

diff --git a/test/test_da_dk_locale.rb b/test/test_da_dk_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestDaDkLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_de_at_locale.rb b/test/test_de_at_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestDeAtLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_de_ch_locale.rb b/test/test_de_ch_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestDeChLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_de_locale.rb b/test/test_de_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestDeLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_determinism.rb b/test/test_determinism.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 # rubocop:disable Security/Eval,Style/EvalWithLocation
 class TestDeterminism < Test::Unit::TestCase
   def setup

diff --git a/test/test_ee_locale.rb b/test/test_ee_locale.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEeLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_au_locale.rb b/test/test_en_au_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnAuLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_au_ocker_locale.rb b/test/test_en_au_ocker_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnAuOckerLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_ca_locale.rb b/test/test_en_ca_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnCaLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_gb_locale.rb b/test/test_en_gb_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnGbLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_ind_locale.rb b/test/test_en_ind_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnIndLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_locale.rb b/test/test_en_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_ms_locale.rb b/test/test_en_ms_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnMsLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_nep_locale.rb b/test/test_en_nep_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnNepLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_ng_locale.rb b/test/test_en_ng_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnNgLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_nz_locale.rb b/test/test_en_nz_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnNzLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_pak_locale.rb b/test/test_en_pak_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnPakLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_sg_locale.rb b/test/test_en_sg_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnSgLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_ug_locale.rb b/test/test_en_ug_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnUgLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_en_us_locale.rb b/test/test_en_us_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEnUsLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_es_locale.rb b/test/test_es_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 LoadedEsYaml = %w[en es].each_with_object({}) do |locale, h|
   h[locale] = YAML.load_file(File.expand_path(File.dirname(__FILE__) + "/../lib/locales/#{locale}.yml"))[locale]['faker']

diff --git a/test/test_es_mx_locale.rb b/test/test_es_mx_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestEsMxLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_fa_locale.rb b/test/test_fa_locale.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFaLocale < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker.rb b/test/test_faker.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFaker < Test::Unit::TestCase
   def setup; end

diff --git a/test/test_faker_address.rb b/test/test_faker_address.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerAddress < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_ancient.rb b/test/test_faker_ancient.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerAncient < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_app.rb b/test/test_faker_app.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerApp < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_appliance.rb b/test/test_faker_appliance.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerAppliance < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_aqua_teen_hunger_force.rb b/test/test_faker_aqua_teen_hunger_force.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerAquaTeenHungerForce < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_artist.rb b/test/test_faker_artist.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerArtist < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_back_to_the_future.rb b/test/test_faker_back_to_the_future.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBackToTheFuture < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_bank.rb b/test/test_faker_bank.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBank < Test::Unit::TestCase
   IBAN_HEADER = '[A-Z]{2}[0-9]{2}'.freeze

diff --git a/test/test_faker_beer.rb b/test/test_faker_beer.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBeer < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_birthday_in_leap_year.rb b/test/test_faker_birthday_in_leap_year.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBirthdayInLeapYear < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_bitcoin.rb b/test/test_faker_bitcoin.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBitcoin < Test::Unit::TestCase
   def test_address

diff --git a/test/test_faker_book.rb b/test/test_faker_book.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBook < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_boolean.rb b/test/test_faker_boolean.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 require 'minitest/mock'
 
 class TestFakerBoolean < Test::Unit::TestCase

diff --git a/test/test_faker_bossa_nova.rb b/test/test_faker_bossa_nova.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerBossaNova < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_breaking_bad.rb b/test/test_faker_breaking_bad.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require_relative 'test_helper'
 
 class TestFakerBreakingBad < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_business.rb b/test/test_faker_business.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require_relative 'test_helper'
 
 class TestFakerBusiness < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_cannabis.rb b/test/test_faker_cannabis.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require_relative 'test_helper'
 
 class TestFakerCannabis < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_cat.rb b/test/test_faker_cat.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCat < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_char.rb b/test/test_faker_char.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerChar < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_chuck_norris.rb b/test/test_faker_chuck_norris.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerChuckNorris < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_city.rb b/test/test_faker_city.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require_relative 'test_helper'
 
 class TestFakerCity < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_code.rb b/test/test_faker_code.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require_relative 'test_helper'
 
 class TestFakerCode < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_coffee.rb b/test/test_faker_coffee.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCoffee < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_color.rb b/test/test_faker_color.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerColor < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_commerce.rb b/test/test_faker_commerce.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCommerce < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_community.rb b/test/test_faker_community.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCommunity < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_company.rb b/test/test_faker_company.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCompany < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_compass.rb b/test/test_faker_compass.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCompass < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_crypto.rb b/test/test_faker_crypto.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCrypto < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_currency.rb b/test/test_faker_currency.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerCurrency < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_date.rb b/test/test_faker_date.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerDate < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_demographic.rb b/test/test_faker_demographic.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerDemographic < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_dessert.rb b/test/test_faker_dessert.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerDessert < Test::Unit::TestCase
   def setup

diff --git a/test/test_faker_device.rb b/test/test_faker_device.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+require_relative 'test_helper'
 
 class TestFakerDevice < Test::Unit::TestCase
   def setup