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

- old
+ new

@@ -1,22 +1,20 @@ -require File.join(File.dirname(__FILE__), "helper") +require File.join(File.dirname(__FILE__), 'helper') class GeobytesGeocoderTest < BaseGeocoderTest #:nodoc: all def setup super - @ip = "12.12.12.12" + @ip = '12.12.12.12' 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_geobytes_geocoder - VCR.use_cassette("geobytes_geocode") do - url = "http://getcitydetails.geobytes.com/GetCityDetails?fqcn=#{@ip}" - res = Geokit::Geocoders::GeobytesGeocoder.geocode(@ip) - assert_url url - assert_equal res.city, "New York" - assert_equal res.state, "NY" - assert_equal res.country_code, "US" - end + url = "http://getcitydetails.geobytes.com/GetCityDetails?fqcn=#{@ip}" + res = geocode(@ip, :geobytes_geocode) + assert_url url + assert_equal res.city, 'New York' + assert_equal res.state, 'NY' + assert_equal res.country_code, 'US' end end