diff --git a/.rubocop.yml b/.rubocop.yml index 187f81a..e5cad33 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -140,7 +140,6 @@ Style/Documentation: - 'lib/geokit/geocoders/fcc.rb' - 'lib/geokit/geocoders/geocodio.rb' - 'lib/geokit/geocoders/google.rb' - - 'lib/geokit/geocoders/us_geocoder.rb' - 'lib/geokit/geocoders/yahoo.rb' - 'lib/geokit/inflectors.rb' - 'lib/geokit/lat_lng.rb' @@ -182,7 +181,6 @@ Layout/ExtraSpacing: - 'lib/geokit/geocoders/yahoo.rb' - 'test/test_mappable.rb' - 'test/test_opencage_geocoder.rb' - - 'test/test_us_geocoder.rb' # Offense count: 1 # Configuration parameters: EnforcedStyle, SupportedStyles. @@ -239,7 +237,6 @@ Style/MutableConstant: - 'test/test_geo_plugin_geocoder.rb' - 'test/test_ipgeocoder.rb' - 'test/test_net_adapter.rb' - - 'test/test_us_geocoder.rb' # Offense count: 10 # Cop supports --auto-correct. diff --git a/test/test_multi_geocoder.rb b/test/test_multi_geocoder.rb index b60e7d0..086bbb9 100644 --- a/test/test_multi_geocoder.rb +++ b/test/test_multi_geocoder.rb @@ -22,14 +22,12 @@ def test_failover def test_double_failover Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure) Geokit::Geocoders::BingGeocoder.expects(:geocode).with(@address).returns(@failure) - Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address).returns(@success) assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address) end def test_failure Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure) Geokit::Geocoders::BingGeocoder.expects(:geocode).with(@address).returns(@failure) - Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address).returns(@failure) assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address) end @@ -66,14 +64,12 @@ def test_reverse_geocode_failover def test_reverse_geocode_double_failover Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure) Geokit::Geocoders::BingGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure) - Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success) assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng) end def test_reverse_geocode_failure Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure) Geokit::Geocoders::BingGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure) - Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure) assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng) end @@ -97,7 +93,6 @@ def test_reverse_geocode_with_blank_latlng def test_custom_provider_order Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@success) Geokit::Geocoders::GoogleGeocoder.expects(:geocode).never - Geokit::Geocoders::UsGeocoder.expects(:geocode).never assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address, provider_order: [:yahoo, :google, :us]) end