query_spec.rb in barometer-0.7.2

- old
+ new

@@ -14,21 +14,18 @@
     
     # actual conversions
     @zipcode_to_coordinates = "34.1030032,-118.4104684"
     @zipcode_to_geocode = "Beverly Hills, CA, USA"
     @zipcode_to_weather_id = "USCA0090"
-    @postalcode_to_coordinates = "53.570447,-113.456083"
-    @geocode_to_coordinates = "40.7142691,-74.0059729"
+    @postalcode_to_coordinates = "53.570516,-113.45784"
+    @geocode_to_coordinates = "40.7143528,-74.0059731"
     @geocode_to_weather_id = "USNY0996"
-    @coordinates_to_geocode = "New York, NY, USA"
+    @coordinates_to_geocode = "Manhattan, NY, USA"
     @coordinates_to_weather_id = "USNY0996"
     @icao_to_coordinates = "37.615223,-122.389979"
-    @icao_to_geocode = "Millbrae, CA, USA"
+    @icao_to_geocode = "San Francisco, CA, USA"
     @icao_to_weather_id = "USCA0987"
-    
-    Barometer.google_geocode_key = nil
-    #Barometer.skip_graticule = true
   end
   
   describe "determines the query format" do
     
     before(:each) do
@@ -133,20 +130,10 @@
     it "determines the format" do
       query = Barometer::Query.new(@geocode)
       query.format.should_not be_nil
     end
     
-    it "responds to google_api_key" do
-      Barometer.google_geocode_key.should be_nil
-    end
-    
-    it "defaults to the Module geocode key" do
-      key = "KEY"
-      Barometer.google_geocode_key = key
-      Barometer.google_geocode_key.should == key
-    end
-    
     it "responds to geo" do
       @query.geo.should be_nil
     end
     
     it "responds to timezone" do
@@ -242,11 +229,10 @@
       
       describe "with an intial format of :short_zipcode," do
         
         before(:each) do
           @query = Barometer::Query.new(@short_zipcode)
-          Barometer.google_geocode_key = KEY
         end
         
         it "converts to zipcode" do
           acceptable_formats = [:zipcode]
           query = @query.convert!(acceptable_formats)
@@ -291,11 +277,10 @@
       
       describe "with an intial format of :zipcode," do
         
         before(:each) do
           @query = Barometer::Query.new(@zipcode)
-          Barometer.google_geocode_key = KEY
           Barometer.force_geocode = false
         end
         
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
@@ -341,11 +326,10 @@
       
       describe "with an intial format of :postalcode," do
         
         before(:each) do
           @query = Barometer::Query.new(@postal_code)
-          Barometer.google_geocode_key = KEY
         end
         
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
@@ -387,11 +371,10 @@
       
       describe "with an intial format of :icao," do
         
         before(:each) do
           @query = Barometer::Query.new(@icao)
-          Barometer.google_geocode_key = KEY
         end
         
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
@@ -435,11 +418,10 @@
       
       describe "with an intial format of :geocode," do
         
         before(:each) do
           @query = Barometer::Query.new(@geocode)
-          Barometer.google_geocode_key = KEY
         end
         
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
@@ -482,10 +464,9 @@
       
       describe "with an intial format of :coordinates," do
         
         before(:each) do
           @query = Barometer::Query.new(@coordinates)
-          Barometer.google_geocode_key = KEY
         end
         
         it "converts to geocode" do
           acceptable_formats = [:geocode]
           query = @query.convert!(acceptable_formats)
\ No newline at end of file