Merge remote-tracking branch 'upstream/pull/4983'

This commit is contained in:
Tom Hughes 2024-07-13 15:00:42 +01:00
commit ce41bc3d6d

View file

@ -418,8 +418,8 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
assert_template :layout => "map"
assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources).pluck(:name)
assert_nil @controller.params[:query]
assert_match(/^[+-]?\d+(?:\.\d*)?$/, @controller.params[:lat])
assert_match(/^[+-]?\d+(?:\.\d*)?$/, @controller.params[:lon])
assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lat])
assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lon])
assert_in_delta lat, @controller.params[:lat].to_f
assert_in_delta lon, @controller.params[:lon].to_f
@ -429,8 +429,8 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
assert_template :layout => "xhr"
assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources).pluck(:name)
assert_nil @controller.params[:query]
assert_match(/^[+-]?\d+(?:\.\d*)?$/, @controller.params[:lat])
assert_match(/^[+-]?\d+(?:\.\d*)?$/, @controller.params[:lon])
assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lat])
assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lon])
assert_in_delta lat, @controller.params[:lat].to_f
assert_in_delta lon, @controller.params[:lon].to_f
end