choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to geokit version 1.8.5

This commit is contained in:
Erik Michaels-Ober 2014-06-17 11:31:24 +02:00
parent 1d1edc0d3a
commit 1c9ef731c9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -60,7 +60,7 @@ GEM
fastercsv (1.5.5) fastercsv (1.5.5)
font-awesome-rails (4.1.0.0) font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
geokit (1.8.4) geokit (1.8.5)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
haml (4.0.5) haml (4.0.5)
tilt tilt

4
test/controllers/addresses_controller_test.rb
View File

@ -2,7 +2,7 @@ require 'test_helper'
class AddressesControllerTest < ActionController::TestCase class AddressesControllerTest < ActionController::TestCase
test 'should return latitude and longitude for a valid address' do test 'should return latitude and longitude for a valid address' do
stub_request(:get, 'http://maps.google.com/maps/api/geocode/json'). stub_request(:get, 'https://maps.google.com/maps/api/geocode/json').
with(query: {address: 'City Hall, Boston, MA', sensor: 'false'}). with(query: {address: 'City Hall, Boston, MA', sensor: 'false'}).
to_return(body: File.read(File.expand_path('../../fixtures/city_hall.json', __FILE__))) to_return(body: File.read(File.expand_path('../../fixtures/city_hall.json', __FILE__)))
get :show, address: 'City Hall', city_state: 'Boston, MA', format: 'json' get :show, address: 'City Hall', city_state: 'Boston, MA', format: 'json'
@ -10,7 +10,7 @@ class AddressesControllerTest < ActionController::TestCase
end end
test 'should return an error for an invalid address' do test 'should return an error for an invalid address' do
stub_request(:get, 'http://maps.google.com/maps/api/geocode/json'). stub_request(:get, 'https://maps.google.com/maps/api/geocode/json').
with(query: {address: ', ', sensor: 'false'}). with(query: {address: ', ', sensor: 'false'}).
to_return(body: File.read(File.expand_path('../../fixtures/unknown_address.json', __FILE__))) to_return(body: File.read(File.expand_path('../../fixtures/unknown_address.json', __FILE__)))
stub_request(:get, 'http://geocoder.us/service/csv/geocode'). stub_request(:get, 'http://geocoder.us/service/csv/geocode').

2
test/controllers/reminders_controller_test.rb
View File

@ -9,7 +9,7 @@ class RemindersControllerTest < ActionController::TestCase
@user = users(:erik) @user = users(:erik)
@thing.user = @dan @thing.user = @dan
@thing.save! @thing.save!
stub_request(:get, 'http://maps.google.com/maps/api/geocode/json'). stub_request(:get, 'https://maps.google.com/maps/api/geocode/json').
with(query: {latlng: '42.383339,-71.049226', sensor: 'false'}). with(query: {latlng: '42.383339,-71.049226', sensor: 'false'}).
to_return(body: File.read(File.expand_path('../../fixtures/city_hall.json', __FILE__))) to_return(body: File.read(File.expand_path('../../fixtures/city_hall.json', __FILE__)))
end end