From b8f126bcf6d53417d49b9cdd933714421fb8925c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 4 Aug 2013 12:50:05 +0100 Subject: [PATCH] Update short link integration tests for hash links --- test/integration/short_links_test.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb index ffa5d5394..6b85554e2 100644 --- a/test/integration/short_links_test.rb +++ b/test/integration/short_links_test.rb @@ -13,23 +13,24 @@ class ShortLinksTest < ActionController::IntegrationTest # utility method to test short links def assert_short_link_redirect(short_link) lon, lat, zoom = ShortLink::decode(short_link) + anchor = "#{zoom}/#{lat}/#{lon}" # test without marker get '/go/' + short_link - assert_redirected_to :controller => 'site', :action => 'index', :lat => lat.to_s, :lon => lon.to_s, :zoom => zoom.to_s + 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, :zoom => zoom.to_s + 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, :zoom => zoom.to_s, :layers => "B000FTF" + assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :layers => "B000FTF", :anchor => anchor get '/go/' + short_link + "?layers=B000FTF&m" - assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :zoom => zoom.to_s, :layers => "B000FTF" + assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :layers => "B000FTF", :anchor => anchor # 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', :lat => lat.to_s, :lon => lon.to_s, :zoom => zoom.to_s, :foobar => "yes" + assert_redirected_to :controller => 'site', :action => 'index', :foobar => "yes", :anchor => anchor end end -- 2.43.2