X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/efc6aaf21514f45d53ebab849b2696faf2f58548..4f05b6a8accae4877f81e617262a52cf0428cf8f:/test/functional/geocoder_controller_test.rb?ds=sidebyside

diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb
index bbb1b0f01..51fc2020a 100644
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/functional/geocoder_controller_test.rb
@@ -11,10 +11,6 @@ class GeocoderControllerTest < ActionController::TestCase
       { :path => "/geocoder/search", :method => :post },
       { :controller => "geocoder", :action => "search" }
     )
-    assert_routing(
-      { :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" }
@@ -35,18 +31,13 @@ class GeocoderControllerTest < ActionController::TestCase
       { :path => "/geocoder/search_geonames", :method => :get },
       { :controller => "geocoder", :action => "search_geonames" }
     )
-
-    assert_routing(
-      { :path => "/geocoder/description", :method => :post },
-      { :controller => "geocoder", :action => "description" }
-    )
     assert_routing(
-      { :path => "/geocoder/description_osm_nominatim", :method => :get },
-      { :controller => "geocoder", :action => "description_osm_nominatim" }
+      { :path => "/geocoder/search_osm_nominatim_reverse", :method => :get },
+      { :controller => "geocoder", :action => "search_osm_nominatim_reverse" }
     )
     assert_routing(
-      { :path => "/geocoder/description_geonames", :method => :get },
-      { :controller => "geocoder", :action => "description_geonames" }
+      { :path => "/geocoder/search_geonames_reverse", :method => :get },
+      { :controller => "geocoder", :action => "search_geonames_reverse" }
     )
   end
 
@@ -61,8 +52,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal code, assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -77,8 +70,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "50.06773, 14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -93,8 +88,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "50.06773, -14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta -14.37742, @controller.params[:lon]
     end
   end
 
@@ -109,8 +106,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "-50.06773, 14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta -50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -125,8 +124,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "-50.06773, -14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta -50.06773, @controller.params[:lat]
+      assert_in_delta -14.37742, @controller.params[:lon]
     end
   end
 
@@ -144,8 +145,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_latlon_equal_round "50.06773, 14.37742", assigns(:query), 5
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -163,8 +166,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_latlon_equal_round "50.06773, -14.37742", assigns(:query), 5
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta -14.37742, @controller.params[:lon]
     end
   end
 
@@ -182,8 +187,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_latlon_equal_round "-50.06773, 14.37742", assigns(:query), 5
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta -50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -201,8 +208,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_latlon_equal_round "-50.06773, -14.37742", assigns(:query), 5
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta -50.06773, @controller.params[:lat]
+      assert_in_delta -14.37742, @controller.params[:lon]
     end
   end
 
@@ -219,8 +228,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "50.06773, 14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -237,8 +248,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "50.06773, -14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta 50.06773, @controller.params[:lat]
+      assert_in_delta -14.37742, @controller.params[:lon]
     end
   end
 
@@ -255,8 +268,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "-50.06773, 14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta -50.06773, @controller.params[:lat]
+      assert_in_delta 14.37742, @controller.params[:lon]
     end
   end
 
@@ -273,8 +288,10 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['latlon'], assigns(:sources)
-      assert_equal "-50.06773, -14.37742", assigns(:query)
+      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      assert_nil @controller.params[:query]
+      assert_in_delta -50.06773, @controller.params[:lat]
+      assert_in_delta -14.37742, @controller.params[:lon]
     end
   end
 
@@ -324,13 +341,4 @@ class GeocoderControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal ['osm_nominatim'], assigns(:sources)
   end
-
-private
-
-  ##
-  # this is a test helper for rounding latlon strings to a specified precision, e.g., at a precision 
-  # of 5, "50.06773333333334, -14.377416666666667" will become "50.06773, -14.37742"
-  def assert_latlon_equal_round(expected, actual, precision)
-    assert_equal expected.split(',').map {|i| i.to_f.round(precision)}.join(', '), actual.split(',').map {|i| i.to_f.round(precision)}.join(', ')
-  end
 end