X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..cc8bb7c6a5730e9d7d0389e4efd4c896702f575f:/test/integration/short_links_test.rb diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb index 0d42ae738..8f949fdae 100644 --- a/test/integration/short_links_test.rb +++ b/test/integration/short_links_test.rb @@ -9,6 +9,8 @@ class ShortLinksTest < ActionDispatch::IntegrationTest assert_short_link_redirect(ShortLink.encode(-0.107846, 51.50771, 18)) end + private + ## # utility method to test short links def assert_short_link_redirect(short_link) @@ -16,21 +18,21 @@ class ShortLinksTest < ActionDispatch::IntegrationTest anchor = "map=#{zoom}/#{lat}/#{lon}" # test without marker - get "/go/" + short_link + get "/go/#{short_link}" assert_redirected_to :controller => "site", :action => "index", :anchor => anchor # test with marker - get "/go/" + short_link + "?m" + get "/go/#{short_link}?m" assert_redirected_to :controller => "site", :action => "index", :mlat => lat.to_s, :mlon => lon.to_s, :anchor => anchor # test with layers and a marker - get "/go/" + short_link + "?m&layers=B000FTF" + get "/go/#{short_link}?m&layers=B000FTF" assert_redirected_to :controller => "site", :action => "index", :mlat => lat.to_s, :mlon => lon.to_s, :anchor => "#{anchor}&layers=B000FTF" - get "/go/" + short_link + "?layers=B000FTF&m" + get "/go/#{short_link}?layers=B000FTF&m" assert_redirected_to :controller => "site", :action => "index", :mlat => lat.to_s, :mlon => lon.to_s, :anchor => "#{anchor}&layers=B000FTF" # test with some random query parameters we haven't even implemented yet - get "/go/" + short_link + "?foobar=yes" + get "/go/#{short_link}?foobar=yes" assert_redirected_to :controller => "site", :action => "index", :foobar => "yes", :anchor => anchor end end