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

[rails.git] / test / integration / short_links_test.rb

diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb
index 31c6cc1112e40d84a86c53e677c1446271d9ba79..8f949fdaeddf501fdc167941160322303e62f7e1 100644 (file)
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,14 +1,16 @@
-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
 
 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("1N8H@P_5W")

     assert_short_link_redirect(ShortLink.encode(-0.107846, 51.50771, 18))
   end
 
     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)
   ##
   # 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
     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
 
     # 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
 
     # 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
 
     # 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
   end
 end