X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9d35839befe92d916425baa4daec7dd77ade929..c1cdddf11f363d24f7c18b3e9df15e1bde3c4302:/test/controllers/geocoder_controller_test.rb?ds=sidebyside diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index 7899bd982..ecddf96aa 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -51,7 +51,7 @@ class GeocoderControllerTest < ActionController::TestCase get :search assert_response :bad_request - xhr :get, :search + get :search, :xhr => true assert_response :bad_request end @@ -251,9 +251,9 @@ class GeocoderControllerTest < ActionController::TestCase "12345", "12345-6789" ].each do |code| - post :search, :query => code + post :search, :params => { :query => code } assert_response :success - assert_equal %w(us_postcode osm_nominatim), assigns(:sources) + assert_equal %w[us_postcode osm_nominatim], assigns(:sources) end end @@ -269,38 +269,38 @@ class GeocoderControllerTest < ActionController::TestCase "CR2 6XH", "DN55 1PT" ].each do |code| - search_check code, %w(uk_postcode osm_nominatim) + search_check code, %w[uk_postcode osm_nominatim] end end ## # Test identification of Canadian postcodes def test_identify_ca_postcode - search_check "A1B 2C3", %w(ca_postcode osm_nominatim) + search_check "A1B 2C3", %w[ca_postcode osm_nominatim] end ## # Test identification fall through to the default case def test_identify_default - search_check "foo bar baz", %w(osm_nominatim geonames) + search_check "foo bar baz", %w[osm_nominatim geonames] end ## # Test the builtin latitude+longitude search def test_search_latlon - xhr :get, :search_latlon, :lat => 1.23, :lon => 4.56, :zoom => 16 + get :search_latlon, :params => { :lat => 1.23, :lon => 4.56, :zoom => 16 }, :xhr => true results_check :name => "1.23, 4.56", :lat => 1.23, :lon => 4.56, :zoom => 16 - xhr :get, :search_latlon, :lat => -91.23, :lon => 4.56, :zoom => 16 + get :search_latlon, :params => { :lat => -91.23, :lon => 4.56, :zoom => 16 }, :xhr => true results_check_error "Latitude -91.23 out of range" - xhr :get, :search_latlon, :lat => 91.23, :lon => 4.56, :zoom => 16 + get :search_latlon, :params => { :lat => 91.23, :lon => 4.56, :zoom => 16 }, :xhr => true results_check_error "Latitude 91.23 out of range" - xhr :get, :search_latlon, :lat => 1.23, :lon => -180.23, :zoom => 16 + get :search_latlon, :params => { :lat => 1.23, :lon => -180.23, :zoom => 16 }, :xhr => true results_check_error "Longitude -180.23 out of range" - xhr :get, :search_latlon, :lat => 1.23, :lon => 180.23, :zoom => 16 + get :search_latlon, :params => { :lat => 1.23, :lon => 180.23, :zoom => 16 }, :xhr => true results_check_error "Longitude 180.23 out of range" end @@ -308,17 +308,17 @@ class GeocoderControllerTest < ActionController::TestCase # Test the US postcode search def test_search_us_postcode with_http_stubs "geocoder_us" do - xhr :get, :search_us_postcode, - :query => "90210", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_us_postcode, :xhr => true, + :params => { :query => "90210", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check :prefix => "Beverly Hills, CA,", :name => "90210", :lat => 34.088808, :lon => -118.40612 - xhr :get, :search_us_postcode, - :query => "00000", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_us_postcode, :xhr => true, + :params => { :query => "00000", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check end end @@ -327,16 +327,16 @@ class GeocoderControllerTest < ActionController::TestCase # Test the UK postcode search def test_search_uk_postcode with_http_stubs "npemap" do - xhr :get, :search_uk_postcode, - :query => "CV4 7AL", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_uk_postcode, :xhr => true, + :params => { :query => "CV4 7AL", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check :name => "CV4 7AL", :lat => 52.381748701968, :lon => -1.56176420939232 - xhr :get, :search_uk_postcode, - :query => "XX9 9XX", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_uk_postcode, :xhr => true, + :params => { :query => "XX9 9XX", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check end end @@ -345,22 +345,22 @@ class GeocoderControllerTest < ActionController::TestCase # Test the Canadian postcode search def test_search_ca_postcode with_http_stubs "geocoder_ca" do - xhr :get, :search_ca_postcode, - :query => "A1B 2C3", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_ca_postcode, :xhr => true, + :params => { :query => "A1B 2C3", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check :name => "A1B 2C3", :lat => "47.172520", :lon => "-55.440515" - xhr :get, :search_ca_postcode, - :query => "k1a 0b1", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_ca_postcode, :xhr => true, + :params => { :query => "k1a 0b1", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check :name => "K1A 0B1", :lat => "45.375437", :lon => "-75.691041" - xhr :get, :search_ca_postcode, - :query => "Q0Q 0Q0", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_ca_postcode, :xhr => true, + :params => { :query => "Q0Q 0Q0", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check end end @@ -369,25 +369,25 @@ class GeocoderControllerTest < ActionController::TestCase # Test the nominatim forward search def test_search_osm_nominatim with_http_stubs "nominatim" do - xhr :get, :search_osm_nominatim, - :query => "Hoddesdon", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_osm_nominatim, :xhr => true, + :params => { :query => "Hoddesdon", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check "name" => "Hoddesdon, Hertfordshire, East of England, England, United Kingdom", "min-lat" => 51.7216709, "max-lat" => 51.8016709, "min-lon" => -0.0512898, "max-lon" => 0.0287102, "type" => "node", "id" => 18007599 - xhr :get, :search_osm_nominatim, - :query => "Broxbourne", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_osm_nominatim, :xhr => true, + :params => { :query => "Broxbourne", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check({ "prefix" => "Suburb", "name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom", "min-lat" => 51.7265723, "max-lat" => 51.7665723, "min-lon" => -0.0390782, "max-lon" => 0.0009218, "type" => "node", "id" => 28825933 }, - { "prefix" => "City Boundary", + { "prefix" => "Village", "name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom", "min-lat" => 51.6808751, "max-lat" => 51.7806237, "min-lon" => -0.114204, "max-lon" => 0.0145267, @@ -404,16 +404,16 @@ class GeocoderControllerTest < ActionController::TestCase # Test the geonames forward search def test_search_geonames with_http_stubs "geonames" do - xhr :get, :search_geonames, - :query => "Hoddesdon", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_geonames, :xhr => true, + :params => { :query => "Hoddesdon", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check :name => "Hoddesdon", :lat => 51.76148, :lon => -0.01144 - xhr :get, :search_geonames, - :query => "Broxbourne", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 + get :search_geonames, :xhr => true, + :params => { :query => "Broxbourne", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766 } results_check({ :name => "Broxbourne", :lat => 51.74712, :lon => -0.01923 }, { :name => "Broxbourne District", :lat => 51.73026, :lon => -0.04821 }, { :name => "Cheshunt", :lat => 51.70791, :lon => -0.03739 }, @@ -438,12 +438,14 @@ class GeocoderControllerTest < ActionController::TestCase # Test the nominatim reverse search def test_search_osm_nominatim_reverse with_http_stubs "nominatim" do - xhr :get, :search_osm_nominatim_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 15 + get :search_osm_nominatim_reverse, :xhr => true, + :params => { :lat => 51.7632, :lon => -0.0076, :zoom => 15 } results_check :name => "Broxbourne, Hertfordshire, East of England, England, United Kingdom", :lat => 51.7465723, :lon => -0.0190782, :type => "node", :id => 28825933, :zoom => 15 - xhr :get, :search_osm_nominatim_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 17 + get :search_osm_nominatim_reverse, :xhr => true, + :params => { :lat => 51.7632, :lon => -0.0076, :zoom => 17 } results_check :name => "Dinant Link Road, Broxbourne, Hertfordshire, East of England, England, EN11 8HX, United Kingdom", :lat => 51.7634883, :lon => -0.0088373, :type => "way", :id => 3489841, :zoom => 17 @@ -454,7 +456,8 @@ class GeocoderControllerTest < ActionController::TestCase # Test the geonames reverse search def test_search_geonames_reverse with_http_stubs "geonames" do - xhr :get, :search_geonames_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 15 + get :search_geonames_reverse, :xhr => true, + :params => { :lat => 51.7632, :lon => -0.0076, :zoom => 15 } results_check :name => "England", :suffix => ", United Kingdom", :lat => 51.7632, :lon => -0.0076 end @@ -463,33 +466,33 @@ class GeocoderControllerTest < ActionController::TestCase private def latlon_check(query, lat, lon) - get :search, :query => query + get :search, :params => { :query => query } assert_response :success assert_template :search assert_template :layout => "map" - assert_equal %w(latlon osm_nominatim_reverse geonames_reverse), assigns(:sources) + assert_equal %w[latlon osm_nominatim_reverse geonames_reverse], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon] - xhr :get, :search, :query => query + get :search, :params => { :query => query }, :xhr => true assert_response :success assert_template :search assert_template :layout => "xhr" - assert_equal %w(latlon osm_nominatim_reverse geonames_reverse), assigns(:sources) + assert_equal %w[latlon osm_nominatim_reverse geonames_reverse], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon] end def search_check(query, sources) - get :search, :query => query + get :search, :params => { :query => query } assert_response :success assert_template :search assert_template :layout => "map" assert_equal sources, assigns(:sources) - xhr :get, :search, :query => query + get :search, :params => { :query => query }, :xhr => true assert_response :success assert_template :search assert_template :layout => "xhr"