test/test_google_geocoder.rb in geokit-1.8.0 vs test/test_google_geocoder.rb in geokit-1.8.1

@@ -1,12 +1,8 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::google_client_id = nil
-Geokit::Geocoders::google_cryptographic_key = nil
-Geokit::Geocoders::google_channel = nil
-
 class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def setup
     super
     @full_address = '100 Spear St Apt. 5, San Francisco, CA, 94105-1522, US'
@@ -30,14 +26,14 @@
 
 
   # Example from:
   # https://developers.google.com/maps/documentation/business/webservices#signature_examples
   def test_google_signature_and_url
-    Geokit::Geocoders::google_client_id = 'clientID'
-    Geokit::Geocoders::google_cryptographic_key = 'vNIXE0xscrmjlyV-12Nj_BvUPaw='
+    Geokit::Geocoders::GoogleGeocoder.client_id = 'clientID'
+    Geokit::Geocoders::GoogleGeocoder.cryptographic_key = 'vNIXE0xscrmjlyV-12Nj_BvUPaw='
     url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, '/maps/api/geocode/json?address=New+York&sensor=false')
-    Geokit::Geocoders::google_client_id = nil
-    Geokit::Geocoders::google_cryptographic_key = nil
+    Geokit::Geocoders::GoogleGeocoder.client_id = nil
+    Geokit::Geocoders::GoogleGeocoder.cryptographic_key = nil
     assert_equal 'http://maps.googleapis.com/maps/api/geocode/json?address=New+York&sensor=false&client=clientID&signature=KrU1TzVQM7Ur0i8i7K3huiw3MsA=', url
   end
 
   def test_google_full_address
     VCR.use_cassette('google_full_short') do