Merge remote-tracking branch 'upstream/pull/4895'
This commit is contained in:
commit
ddc252016a
3 changed files with 38 additions and 27 deletions
|
@ -364,7 +364,7 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
|
|||
assert_response :success
|
||||
assert_template :search
|
||||
assert_template :layout => "map"
|
||||
assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources)
|
||||
assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources).pluck(:name)
|
||||
assert_nil @controller.params[:query]
|
||||
assert_in_delta lat, @controller.params[:lat]
|
||||
assert_in_delta lon, @controller.params[:lon]
|
||||
|
@ -373,7 +373,7 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
|
|||
assert_response :success
|
||||
assert_template :search
|
||||
assert_template :layout => "xhr"
|
||||
assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources)
|
||||
assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources).pluck(:name)
|
||||
assert_nil @controller.params[:query]
|
||||
assert_in_delta lat, @controller.params[:lat]
|
||||
assert_in_delta lon, @controller.params[:lon]
|
||||
|
@ -384,13 +384,13 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
|
|||
assert_response :success
|
||||
assert_template :search
|
||||
assert_template :layout => "map"
|
||||
assert_equal sources, assigns(:sources)
|
||||
assert_equal sources, assigns(:sources).pluck(:name)
|
||||
|
||||
get search_path(:query => query), :xhr => true
|
||||
assert_response :success
|
||||
assert_template :search
|
||||
assert_template :layout => "xhr"
|
||||
assert_equal sources, assigns(:sources)
|
||||
assert_equal sources, assigns(:sources).pluck(:name)
|
||||
end
|
||||
|
||||
def results_check(*results)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue