diff --git a/test/test_helper.rb b/test/test_helper.rb
index 20d3a13d568f81ffc5b5d49c072a6b72dead0418..9235be2f696a1f485a2bc16a7059e98936486716 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -310,15 +310,17 @@ class PlaceReverseGeocodedWithCustomLookup < ActiveRecord::Base
end
-class Test::Unit::TestCase
+class GeocoderTestCase < Test::Unit::TestCase
def setup
+ super
Geocoder.configure(:maxmind => {:service => :city_isp_org})
end
def teardown
Geocoder.send(:remove_const, :Configuration)
load "geocoder/configuration.rb"
+ super
end
def geocoded_object_params(abbrev)
diff --git a/test/unit/active_record_test.rb b/test/unit/active_record_test.rb
index fff9896a7a69ad5614000fa9968997747a3a048c..3392765302524d285c3b1d898adc36f579902eca 100644
--- a/test/unit/active_record_test.rb
+++ b/test/unit/active_record_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ActiveRecordTest < Test::Unit::TestCase
+class ActiveRecordTest < GeocoderTestCase
def test_exclude_condition_when_model_has_a_custom_primary_key
venue = PlaceWithCustomPrimaryKey.new(*geocoded_object_params(:msg))
diff --git a/test/unit/cache_test.rb b/test/unit/cache_test.rb
index ecd8a2c5cc3b44c744522db08a3c6aa0bec4bf86..d473096443a76f6b66bf464917a1dc00b26b6176 100644
--- a/test/unit/cache_test.rb
+++ b/test/unit/cache_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class CacheTest < Test::Unit::TestCase
+class CacheTest < GeocoderTestCase
def test_second_occurrence_of_request_is_cache_hit
Geocoder.configure(:cache => {})
diff --git a/test/unit/calculations_test.rb b/test/unit/calculations_test.rb
index 272eca1f421797eb9486e6a2248995f0e40c46c1..98fdfbcd0155441bab17d3eba962f0a56c8e779e 100644
--- a/test/unit/calculations_test.rb
+++ b/test/unit/calculations_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class CalculationsTest < Test::Unit::TestCase
+class CalculationsTest < GeocoderTestCase
def setup
Geocoder.configure(
:units => :mi,
diff --git a/test/unit/configuration_test.rb b/test/unit/configuration_test.rb
index 8b9575a32ef424afdffab4f38230dec6c571cb46..527a57e7bf674f75c539c29bccb85c91caba8790 100644
--- a/test/unit/configuration_test.rb
+++ b/test/unit/configuration_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ConfigurationTest < Test::Unit::TestCase
+class ConfigurationTest < GeocoderTestCase
def setup
Geocoder::Configuration.set_defaults
end
diff --git a/test/unit/error_handling_test.rb b/test/unit/error_handling_test.rb
index cd83c3cdb5b1e51ad88a642076df91f3e1a3d72b..faf53192e594c6c78a3d0fa67b22ff0696f83a55 100644
--- a/test/unit/error_handling_test.rb
+++ b/test/unit/error_handling_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ErrorHandlingTest < Test::Unit::TestCase
+class ErrorHandlingTest < GeocoderTestCase
def teardown
Geocoder.configure(:always_raise => [])
diff --git a/test/unit/geocoder_test.rb b/test/unit/geocoder_test.rb
index 220991d39335c03d8374d76cb7a7c2e5b950e6d4..7dc4e0f5a4860fc44680a6aa500871970a8fd545 100644
--- a/test/unit/geocoder_test.rb
+++ b/test/unit/geocoder_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class GeocoderTest < Test::Unit::TestCase
+class GeocoderTest < GeocoderTestCase
def test_distance_to_returns_float
v = Place.new(*geocoded_object_params(:msg))
diff --git a/test/unit/https_test.rb b/test/unit/https_test.rb
index dd6d02040aca3e132007d85ccd2b02e82a010098..14420dfcd979de9d9cb65be29f9d08dca3c4005c 100644
--- a/test/unit/https_test.rb
+++ b/test/unit/https_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class HttpsTest < Test::Unit::TestCase
+class HttpsTest < GeocoderTestCase
def test_uses_https_for_secure_query
Geocoder.configure(:use_https => true)
diff --git a/test/unit/ip_address_test.rb b/test/unit/ip_address_test.rb
index fcdcd809422a851fcdbc56c7624117111aa837fe..2e36f8bb8fd1a7afa4239bec32c8fef4d09a50bb 100644
--- a/test/unit/ip_address_test.rb
+++ b/test/unit/ip_address_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class IpAddressTest < Test::Unit::TestCase
+class IpAddressTest < GeocoderTestCase
def test_valid
assert Geocoder::IpAddress.new("232.65.123.94").valid?
diff --git a/test/unit/lookup_test.rb b/test/unit/lookup_test.rb
index cd8c412ed3a767f7daaa9b1ae9cb6c1213f435c7..0f8dae4be6bcca4944047b672d3f94b92326a27c 100644
--- a/test/unit/lookup_test.rb
+++ b/test/unit/lookup_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class LookupTest < Test::Unit::TestCase
+class LookupTest < GeocoderTestCase
def test_responds_to_name_method
Geocoder::Lookup.all_services.each do |l|
diff --git a/test/unit/lookups/bing_test.rb b/test/unit/lookups/bing_test.rb
index 7e886ae8d852b3aa305683c1df537166f166217a..f55e2ef9faabec612eca67bb3520ed73ccb778b5 100644
--- a/test/unit/lookups/bing_test.rb
+++ b/test/unit/lookups/bing_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class BingTest < Test::Unit::TestCase
+class BingTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :bing)
diff --git a/test/unit/lookups/dstk_test.rb b/test/unit/lookups/dstk_test.rb
index e05cf32b079614d67afb0e17a4abc3c5fa166930..2e73e4479c550d1239f099d6d5de39dadf2ba27c 100644
--- a/test/unit/lookups/dstk_test.rb
+++ b/test/unit/lookups/dstk_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class DstkTest < Test::Unit::TestCase
+class DstkTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :dstk)
diff --git a/test/unit/lookups/esri_test.rb b/test/unit/lookups/esri_test.rb
index da92592ed525c9794db37426cbe5cf4f92f66bcd..8d6bcbe1e14f8b253b31115606d568d9b067b482 100644
--- a/test/unit/lookups/esri_test.rb
+++ b/test/unit/lookups/esri_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class EsriTest < Test::Unit::TestCase
+class EsriTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :esri)
diff --git a/test/unit/lookups/freegeoip_test.rb b/test/unit/lookups/freegeoip_test.rb
index e0f31acbe85e0c6c82a2f50970b8f4e69a33ef08..565efb6b859154ce3708abe60154707a64b3ddd5 100644
--- a/test/unit/lookups/freegeoip_test.rb
+++ b/test/unit/lookups/freegeoip_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class FreegeoipTest < Test::Unit::TestCase
+class FreegeoipTest < GeocoderTestCase
def setup
Geocoder.configure(ip_lookup: :freegeoip)
diff --git a/test/unit/lookups/geocoder_ca_test.rb b/test/unit/lookups/geocoder_ca_test.rb
index d9dffe200047e2dae32946c10fae3be261d05986..927faaf0b3876641f7e3359df3365322c71289d0 100644
--- a/test/unit/lookups/geocoder_ca_test.rb
+++ b/test/unit/lookups/geocoder_ca_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class GeocoderCaTest < Test::Unit::TestCase
+class GeocoderCaTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :geocoder_ca)
diff --git a/test/unit/lookups/geocodio_test.rb b/test/unit/lookups/geocodio_test.rb
index 2237f5ea715a572bca60e60634ab558014fc4a88..bbf370a9fbecaf0bfef1c77fc3803232ee90d741 100644
--- a/test/unit/lookups/geocodio_test.rb
+++ b/test/unit/lookups/geocodio_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class GeocodioTest < Test::Unit::TestCase
+class GeocodioTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :geocodio)
diff --git a/test/unit/lookups/google_premier_test.rb b/test/unit/lookups/google_premier_test.rb
index b46b3f324d4f35b9d96fcc01758c3c5b1fd614e8..c96c4a1ff212a7df5105599b50e0376ac16f4ab8 100644
--- a/test/unit/lookups/google_premier_test.rb
+++ b/test/unit/lookups/google_premier_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class GooglePremierTest < Test::Unit::TestCase
+class GooglePremierTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :google_premier)
diff --git a/test/unit/lookups/google_test.rb b/test/unit/lookups/google_test.rb
index 967f7d0425cc27b987520385f8eff9788fc6b8f0..fec7acb3244450ed1822438e7dfb8701f605233f 100644
--- a/test/unit/lookups/google_test.rb
+++ b/test/unit/lookups/google_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class GoogleTest < Test::Unit::TestCase
+class GoogleTest < GeocoderTestCase
def test_google_result_components
result = Geocoder.search("Madison Square Garden, New York, NY").first
diff --git a/test/unit/lookups/mapquest_test.rb b/test/unit/lookups/mapquest_test.rb
index c77cbe7fd6300fc94ccf0b155bb024fcd22cb2a0..07e4bbb6f59b0576a0663612625d8573ecb7d6dc 100644
--- a/test/unit/lookups/mapquest_test.rb
+++ b/test/unit/lookups/mapquest_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class MapquestTest < Test::Unit::TestCase
+class MapquestTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :mapquest)
diff --git a/test/unit/lookups/maxmind_local_test.rb b/test/unit/lookups/maxmind_local_test.rb
index b7de9a94d0c8a1302254710a57be76ca411b90aa..28ca402075cc006c0928c309d5eb4713a2b82caa 100644
--- a/test/unit/lookups/maxmind_local_test.rb
+++ b/test/unit/lookups/maxmind_local_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class MaxmindLocalTest < Test::Unit::TestCase
+class MaxmindLocalTest < GeocoderTestCase
def setup
Geocoder.configure(ip_lookup: :maxmind_local)
diff --git a/test/unit/lookups/maxmind_test.rb b/test/unit/lookups/maxmind_test.rb
index 41386bcd80e46f5869ec40e4f622588841d89f69..6fc6cb02456d35a6f2ade84b4f0bf50cfc44210c 100644
--- a/test/unit/lookups/maxmind_test.rb
+++ b/test/unit/lookups/maxmind_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class MaxmindTest < Test::Unit::TestCase
+class MaxmindTest < GeocoderTestCase
def setup
Geocoder.configure(ip_lookup: :maxmind)
diff --git a/test/unit/lookups/nominatim_test.rb b/test/unit/lookups/nominatim_test.rb
index ddab3d1f1bcaef57297f7f4016beeae78d39af97..310fa38109c3003513b05431a8c8e530523c4b98 100644
--- a/test/unit/lookups/nominatim_test.rb
+++ b/test/unit/lookups/nominatim_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class NominatimTest < Test::Unit::TestCase
+class NominatimTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :nominatim)
diff --git a/test/unit/lookups/yahoo_test.rb b/test/unit/lookups/yahoo_test.rb
index 579f5b855cfbbd112210cad330b7038272b4fa78..f299b7b731da0587977dbeed49143f5fb9cdebaa 100644
--- a/test/unit/lookups/yahoo_test.rb
+++ b/test/unit/lookups/yahoo_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class YahooTest < Test::Unit::TestCase
+class YahooTest < GeocoderTestCase
def setup
Geocoder.configure(lookup: :yahoo)
diff --git a/test/unit/method_aliases_test.rb b/test/unit/method_aliases_test.rb
index bb84c0b666ec012e7a580148adba1d3cced1e05a..d33afc4835101678788ec4f0d675a0535686a732 100644
--- a/test/unit/method_aliases_test.rb
+++ b/test/unit/method_aliases_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class MethodAliasesTest < Test::Unit::TestCase
+class MethodAliasesTest < GeocoderTestCase
def test_distance_from_is_alias_for_distance_to
v = Place.new(*geocoded_object_params(:msg))
diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb
index f539eb040f487d6b0181e2c925f7c73970f98685..a4f5d9f72a95a6ade9bb2fe8cd6b7e1e3d3b9905 100644
--- a/test/unit/model_test.rb
+++ b/test/unit/model_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ModelTest < Test::Unit::TestCase
+class ModelTest < GeocoderTestCase
def test_geocode_with_block_runs_block
e = PlaceWithCustomResultsHandling.new(*geocoded_object_params(:msg))
diff --git a/test/unit/mongoid_test.rb b/test/unit/mongoid_test.rb
index d050f4f8a5379c575068145c06e5caa1ccdec85b..78fd4a043acd8a07d2640fc167daf15e3d5dd01e 100644
--- a/test/unit/mongoid_test.rb
+++ b/test/unit/mongoid_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'mongoid_test_helper'
-class MongoidTest < Test::Unit::TestCase
+class MongoidTest < GeocoderTestCase
def test_geocoded_check
p = PlaceUsingMongoid.new(*geocoded_object_params(:msg))
p.location = [40.750354, -73.993371]
diff --git a/test/unit/near_test.rb b/test/unit/near_test.rb
index e62e46da8bfdd3b68b2faabb9d4ca846ec04e7b6..090838694685b030346f99447906b20c3609764a 100644
--- a/test/unit/near_test.rb
+++ b/test/unit/near_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class NearTest < Test::Unit::TestCase
+class NearTest < GeocoderTestCase
def test_near_scope_options_without_sqlite_includes_bounding_box_condition
result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5)
diff --git a/test/unit/oauth_util_test.rb b/test/unit/oauth_util_test.rb
index f9d1b53478c10729780e7723f2d526d522d413bd..d70e333f8df183ecd3489539105d9c35329e9777 100644
--- a/test/unit/oauth_util_test.rb
+++ b/test/unit/oauth_util_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
require 'cgi'
require 'uri'
-class OauthUtilTest < Test::Unit::TestCase
+class OauthUtilTest < GeocoderTestCase
def test_query_string_escapes_single_quote
base_url = "http://example.com?location=d'iberville"
diff --git a/test/unit/proxy_test.rb b/test/unit/proxy_test.rb
index 8460ee49ed464f4c8c16ce4500a58e35e8b05bf9..23d8789a2379c72ed591224fe14b109cf616a06b 100644
--- a/test/unit/proxy_test.rb
+++ b/test/unit/proxy_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ProxyTest < Test::Unit::TestCase
+class ProxyTest < GeocoderTestCase
def test_uses_proxy_when_specified
Geocoder.configure(:http_proxy => 'localhost')
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 58772d415835a4dc29d6a82bc9f126dfe1324862..77c9839e0804dc4d23c2b1686dd1b7d232fb5bc0 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class QueryTest < Test::Unit::TestCase
+class QueryTest < GeocoderTestCase
def test_ip_address_detection
assert Geocoder::Query.new("232.65.123.94").ip_address?
diff --git a/test/unit/request_test.rb b/test/unit/request_test.rb
index 046bca2a571b61657135e3534c03aa88eff89edd..6ffe6b7d399a87e2e6d0ecb53db6896ae92acb9b 100644
--- a/test/unit/request_test.rb
+++ b/test/unit/request_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class RequestTest < Test::Unit::TestCase
+class RequestTest < GeocoderTestCase
class MockRequest
include Geocoder::Request
attr_accessor :env, :ip
diff --git a/test/unit/result_test.rb b/test/unit/result_test.rb
index 4707b62a85d19a14ab19e7462bf2ac1637b3a544..631f3e7bba4a268244b7101c63f801abbd49abea 100644
--- a/test/unit/result_test.rb
+++ b/test/unit/result_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ResultTest < Test::Unit::TestCase
+class ResultTest < GeocoderTestCase
def test_result_has_required_attributes
Geocoder::Lookup.all_services_except_test.each do |l|
diff --git a/test/unit/test_mode_test.rb b/test/unit/test_mode_test.rb
index 62911c558bd83deb49bc09dc2c8690763944d7f9..df0c5480f47befd5241705c2987d0f1c637aab96 100644
--- a/test/unit/test_mode_test.rb
+++ b/test/unit/test_mode_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class TestModeTest < Test::Unit::TestCase
+class TestModeTest < GeocoderTestCase
def setup
@_original_lookup = Geocoder.config.lookup