test/test_fcc_geocoder.rb in geokit-1.10.0 vs test/test_fcc_geocoder.rb in geokit-1.11.0

- old
+ new

@@ -1,23 +1,22 @@ -require File.join(File.dirname(__FILE__), "helper") +require File.join(File.dirname(__FILE__), 'helper') class FCCGeocoderTest < BaseGeocoderTest #:nodoc: all def setup super @la = Geokit::LatLng.new(34.05, -118.25) + @base_url = 'https://data.fcc.gov/api/block/find' end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+") + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_fcc_reverse_geocode - VCR.use_cassette("fcc_reverse_geocode") do - url = "https://data.fcc.gov/api/block/find?format=json&latitude=34.05&longitude=-118.25" - res = Geokit::Geocoders::FCCGeocoder.reverse_geocode(@la) + url = "#{@base_url}?format=json&latitude=34.05&longitude=-118.25" + res = reverse_geocode(@la, :fcc_reverse_geocode) assert_url url - assert_equal res.country_code, "US" - assert_equal res.state, "CA" - assert_equal res.district, "Los Angeles" - end + assert_equal res.country_code, 'US' + assert_equal res.state, 'CA' + assert_equal res.district, 'Los Angeles' end end