X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8..c1cdddf11f363d24f7c18b3e9df15e1bde3c4302:/test/integration/short_links_test.rb?ds=sidebyside

diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb
index d1a6937cb..0d42ae738 100644
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,36 +1,36 @@
-require 'test_helper'
+require "test_helper"
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##
   # test the short link with various parameters and ensure they're
   # kept in the redirect.
   def test_short_link_params
-    assert_short_link_redirect('1N8H@P_5W')
-    assert_short_link_redirect(ShortLink::encode(-0.107846, 51.50771, 18))
+    assert_short_link_redirect("1N8H@P_5W")
+    assert_short_link_redirect(ShortLink.encode(-0.107846, 51.50771, 18))
   end
 
   ##
   # utility method to test short links
   def assert_short_link_redirect(short_link)
-    lon, lat, zoom = ShortLink::decode(short_link)
+    lon, lat, zoom = ShortLink.decode(short_link)
     anchor = "map=#{zoom}/#{lat}/#{lon}"
 
     # test without marker
-    get '/go/' + short_link
-    assert_redirected_to :controller => 'site', :action => 'index', :anchor => anchor
+    get "/go/" + short_link
+    assert_redirected_to :controller => "site", :action => "index", :anchor => anchor
 
     # test with marker
-    get '/go/' + short_link + "?m"
-    assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :anchor => anchor
+    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"
-    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"
-    assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :anchor => "#{anchor}&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"
+    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"
-    assert_redirected_to :controller => 'site', :action => 'index', :foobar => "yes", :anchor => anchor
+    get "/go/" + short_link + "?foobar=yes"
+    assert_redirected_to :controller => "site", :action => "index", :foobar => "yes", :anchor => anchor
   end
 end