X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5b33f3f8e31c62bc3e5db1d5b120533c3afdde68..aa78da82fe9a30dfa77e2d503701787aafc6cf55:/test/controllers/geocoder_controller_test.rb diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index c64efa4e5..d0f0ce086 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -1,9 +1,6 @@ -# coding: utf-8 - require "test_helper" -require "geocoder_controller" -class GeocoderControllerTest < ActionController::TestCase +class GeocoderControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes @@ -15,14 +12,6 @@ class GeocoderControllerTest < ActionController::TestCase { :path => "/geocoder/search_latlon", :method => :get }, { :controller => "geocoder", :action => "search_latlon" } ) - assert_routing( - { :path => "/geocoder/search_us_postcode", :method => :get }, - { :controller => "geocoder", :action => "search_us_postcode" } - ) - assert_routing( - { :path => "/geocoder/search_uk_postcode", :method => :get }, - { :controller => "geocoder", :action => "search_uk_postcode" } - ) assert_routing( { :path => "/geocoder/search_ca_postcode", :method => :get }, { :controller => "geocoder", :action => "search_ca_postcode" } @@ -48,10 +37,10 @@ class GeocoderControllerTest < ActionController::TestCase ## # Test identification with no arguments def test_identify_error - get :search + get search_path assert_response :bad_request - xhr :get, :search + get search_path, :xhr => true assert_response :bad_request end @@ -247,13 +236,11 @@ class GeocoderControllerTest < ActionController::TestCase ## # Test identification of US zipcodes def test_identify_us_postcode - [ - "12345", - "12345-6789" + %w[ + 12345 + 12345-6789 ].each do |code| - post :search, :query => code - assert_response :success - assert_equal %w[us_postcode osm_nominatim], assigns(:sources) + search_check code, %w[osm_nominatim] end end @@ -269,7 +256,7 @@ class GeocoderControllerTest < ActionController::TestCase "CR2 6XH", "DN55 1PT" ].each do |code| - search_check code, %w[uk_postcode osm_nominatim] + search_check code, %w[osm_nominatim] end end @@ -288,79 +275,64 @@ class GeocoderControllerTest < ActionController::TestCase ## # Test the builtin latitude+longitude search def test_search_latlon - xhr :get, :search_latlon, :lat => 1.23, :lon => 4.56, :zoom => 16 + get geocoder_search_latlon_path(: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 geocoder_search_latlon_path(: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 geocoder_search_latlon_path(: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 geocoder_search_latlon_path(: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 geocoder_search_latlon_path(:lat => 1.23, :lon => 180.23, :zoom => 16), :xhr => true results_check_error "Longitude 180.23 out of range" end - ## - # 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 - 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 - results_check - end - end + def test_search_latlon_digits + get geocoder_search_latlon_path(:lat => 1.23, :lon => 4.56, :zoom => 16, :latlon_digits => true), :xhr => true + results_check({ :name => "1.23, 4.56", :lat => 1.23, :lon => 4.56, :zoom => 16 }, + { :name => "4.56, 1.23", :lat => 4.56, :lon => 1.23, :zoom => 16 }) - ## - # 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 - 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 - results_check - end + get geocoder_search_latlon_path(:lat => -91.23, :lon => 4.56, :zoom => 16, :latlon_digits => true), :xhr => true + results_check :name => "4.56, -91.23", :lat => 4.56, :lon => -91.23, :zoom => 16 + + get geocoder_search_latlon_path(:lat => -1.23, :lon => 170.23, :zoom => 16, :latlon_digits => true), :xhr => true + results_check :name => "-1.23, 170.23", :lat => -1.23, :lon => 170.23, :zoom => 16 + + get geocoder_search_latlon_path(:lat => 91.23, :lon => 94.56, :zoom => 16, :latlon_digits => true), :xhr => true + results_check_error "Latitude or longitude are out of range" + + get geocoder_search_latlon_path(:lat => -91.23, :lon => -94.56, :zoom => 16, :latlon_digits => true), :xhr => true + results_check_error "Latitude or longitude are out of range" + + get geocoder_search_latlon_path(:lat => 1.23, :lon => -180.23, :zoom => 16, :latlon_digits => true), :xhr => true + results_check_error "Latitude or longitude are out of range" + + get geocoder_search_latlon_path(:lat => 1.23, :lon => 180.23, :zoom => 16, :latlon_digits => true), :xhr => true + results_check_error "Latitude or longitude are out of range" end ## # 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 geocoder_search_ca_postcode_path(:query => "A1B 2C3", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true + 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 geocoder_search_ca_postcode_path(:query => "k1a 0b1", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true 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 geocoder_search_ca_postcode_path(:query => "Q0Q 0Q0", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true results_check end end @@ -369,19 +341,17 @@ 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 geocoder_search_osm_nominatim_path(:query => "Hoddesdon", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true 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 geocoder_search_osm_nominatim_path(:query => "Broxbourne", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true results_check({ "prefix" => "Suburb", "name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom", "min-lat" => 51.7265723, "max-lat" => 51.7665723, @@ -404,16 +374,13 @@ 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 geocoder_search_geonames_path(:query => "Hoddesdon", :zoom => 10, :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true 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 geocoder_search_geonames_path(:query => "Broxbourne", :zoom => 10, + :minlon => -0.559, :minlat => 51.217, + :maxlon => 0.836, :maxlat => 51.766), :xhr => true 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,15 +405,20 @@ 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 geocoder_search_osm_nominatim_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 15), :xhr => true 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 geocoder_search_osm_nominatim_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 17), :xhr => true 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 + + get geocoder_search_osm_nominatim_reverse_path(:lat => 13.7709, :lon => 100.50507, :zoom => 19), :xhr => true + results_check :name => "MM Steak&Grill, ถนนศรีอยุธยา, บางขุนพรหม, กรุงเทพมหานคร, เขตดุสิต, กรุงเทพมหานคร, 10300, ประเทศไทย", + :lat => 13.7708691, :lon => 100.505073233221, + :type => "way", :id => 542901374, :zoom => 19 end end @@ -454,7 +426,7 @@ 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 geocoder_search_geonames_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 15), :xhr => true results_check :name => "England", :suffix => ", United Kingdom", :lat => 51.7632, :lon => -0.0076 end @@ -463,7 +435,7 @@ class GeocoderControllerTest < ActionController::TestCase private def latlon_check(query, lat, lon) - get :search, :query => query + get search_path(:query => query) assert_response :success assert_template :search assert_template :layout => "map" @@ -472,7 +444,7 @@ class GeocoderControllerTest < ActionController::TestCase assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon] - xhr :get, :search, :query => query + get search_path(:query => query), :xhr => true assert_response :success assert_template :search assert_template :layout => "xhr" @@ -483,13 +455,13 @@ class GeocoderControllerTest < ActionController::TestCase end def search_check(query, sources) - get :search, :query => query + get search_path(:query => query) assert_response :success assert_template :search assert_template :layout => "map" assert_equal sources, assigns(:sources) - xhr :get, :search, :query => query + get search_path(:query => query), :xhr => true assert_response :success assert_template :search assert_template :layout => "xhr" @@ -504,11 +476,11 @@ class GeocoderControllerTest < ActionController::TestCase assert_select "ul.results-list", 0 else assert_select "ul.results-list", 1 do - assert_select "p.search_results_entry", results.count + assert_select "li.search_results_entry", results.count results.each do |result| - attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join("") - assert_select "p.search_results_entry a.set_position#{attrs}", result[:name] + attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join + assert_select "li.search_results_entry a.set_position#{attrs}", result[:name] end end end