Merge branch 'redesign'

[rails.git] / test / functional / geocoder_controller_test.rb

diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb
index 51fc2020ad29fb1b1bc5e3a1fb53e1a7089ff99b..e39bab80b8d7dd7d44ba00f678128441ddbab214 100644 (file)
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/functional/geocoder_controller_test.rb
@@ -8,9 +8,13 @@ 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(
+     { :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" }
@@ -52,7 +56,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -70,7 +74,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -88,7 +92,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -106,7 +110,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -124,7 +128,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -145,7 +149,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -166,7 +170,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -187,7 +191,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -208,7 +212,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -228,7 +232,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -248,7 +252,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -268,7 +272,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]
@@ -288,7 +292,7 @@ class GeocoderControllerTest < ActionController::TestCase
     ].each do |code|
       post :search, :query => code
       assert_response :success
-      assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources)
+      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]