X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2b4f8e92c969a5508b73ae7af45811a118fda6b1..c78853a97e6bcc7c742602867deb70e8da39523e:/test/functional/geocoder_controller_test.rb

diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb
index d8eee97d8..f1b12f21d 100644
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/functional/geocoder_controller_test.rb
@@ -8,7 +8,7 @@ class GeocoderControllerTest < ActionController::TestCase
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
-      { :path => "/geocoder/search", :method => :post },
+      { :path => "/search", :method => :get },
       { :controller => "geocoder", :action => "search" }
     )
     assert_routing(
@@ -54,12 +54,7 @@ class GeocoderControllerTest < ActionController::TestCase
      '+50.06773 +14.37742',
      '+50.06773, +14.37742'
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, 14.37742
     end
   end
 
@@ -72,12 +67,7 @@ class GeocoderControllerTest < ActionController::TestCase
      '50.06773N 14.37742E',
      '50.06773N, 14.37742E'
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, 14.37742
     end
   end
 
@@ -90,12 +80,7 @@ class GeocoderControllerTest < ActionController::TestCase
      '50.06773N 14.37742W',
      '50.06773N, 14.37742W'
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, -14.37742
     end
   end
 
@@ -108,12 +93,7 @@ class GeocoderControllerTest < ActionController::TestCase
      '50.06773S 14.37742E',
      '50.06773S, 14.37742E'
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, -50.06773, 14.37742
     end
   end
 
@@ -126,12 +106,7 @@ class GeocoderControllerTest < ActionController::TestCase
      '50.06773S 14.37742W',
      '50.06773S, 14.37742W'
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, -50.06773, -14.37742
     end
   end
 
@@ -147,12 +122,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'N50 4.064 E14 22.645',
      "50° 04.064' N, 014° 22.645' E"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, 14.37742
     end
   end
 
@@ -168,12 +138,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'N50 4.064 W14 22.645',
      "50° 04.064' N, 014° 22.645' W"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, -14.37742
     end
   end
 
@@ -189,12 +154,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'S50 4.064 E14 22.645',
      "50° 04.064' S, 014° 22.645' E"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, -50.06773, 14.37742
     end
   end
 
@@ -230,12 +190,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'N50 4 03.828, E14 22 38.712',
      "50°4'3.828\"N 14°22'38.712\"E"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, 14.37742
     end
   end
 
@@ -250,12 +205,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'N50 4 03.828, W14 22 38.712',
      "50°4'3.828\"N 14°22'38.712\"W"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, 50.06773, -14.37742
     end
   end
 
@@ -270,12 +220,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'S50 4 03.828, E14 22 38.712',
      "50°4'3.828\"S 14°22'38.712\"E"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, -50.06773, 14.37742
     end
   end
 
@@ -290,12 +235,7 @@ class GeocoderControllerTest < ActionController::TestCase
      'S50 4 03.828, W14 22 38.712',
      "50°4'3.828\"S 14°22'38.712\"W"
     ].each do |code|
-      post :search, :query => code
-      assert_response :success
-      assert_equal ['latlon' ,'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]
+      latlon_check code, -50.06773, -14.37742
     end
   end
 
@@ -313,7 +253,7 @@ class GeocoderControllerTest < ActionController::TestCase
   end
 
   ##
-  # Test identification of UK postcodes using examples from 
+  # Test identification of UK postcodes using examples from
   # http://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom
   def test_identify_uk_postcode
     [
@@ -324,25 +264,54 @@ class GeocoderControllerTest < ActionController::TestCase
      'CR2 6XH',
      'DN55 1PT'
     ].each do |code|
-      post :search, query: code
-      assert_response :success
-      assert_equal ['uk_postcode', 'osm_nominatim'], assigns(:sources)
+      search_check code, ['uk_postcode', 'osm_nominatim']
     end
   end
 
   ##
   # Test identification of Canadian postcodes
   def test_identify_ca_postcode
-    post :search, query: 'A1B 2C3'
-    assert_response :success
-    assert_equal ['ca_postcode', 'osm_nominatim'], assigns(:sources)
+    search_check 'A1B 2C3', ['ca_postcode', 'osm_nominatim']
   end
 
   ##
   # Test identification fall through to the default case
   def test_identify_default
-    post :search, query: 'foo bar baz'
+    search_check 'foo bar baz', ['osm_nominatim']
+  end
+
+private
+  def latlon_check(query, lat, lon)
+    post :search, :query => query
+    assert_response :success
+    assert_template "search"
+    assert_template :layout => "map"
+    assert_equal ['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 :post, :search, :query => query
+    assert_response :success
+    assert_template "search"
+    assert_template :layout => "xhr"
+    assert_equal ['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)
+    post :search, :query => query
+    assert_response :success
+    assert_template "search"
+    assert_template :layout => "map"
+    assert_equal sources, assigns(:sources)
+
+    xhr :post, :search, :query => query
     assert_response :success
-    assert_equal ['osm_nominatim'], assigns(:sources)
+    assert_template "search"
+    assert_template :layout => "xhr"
+    assert_equal sources, assigns(:sources)
   end
 end