Merge branch 'comments'

[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 aec204e71f23f21e22eb8a971e000c3efa8e53ef..d1a6937cb56bb78ce8bd78e1c109dccaaa316d19 100644 (file)
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'

 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##


@@ -25,9 +25,9 @@ class ShortLinksTest < ActionDispatch::IntegrationTest
 
     # test with layers and a marker
     get '/go/' + short_link + "?m&layers=B000FTF"
 
     # 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, :layers => "B000FTF", :anchor => anchor
+    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, :layers => "B000FTF", :anchor => anchor
+    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"
 
     # test with some random query parameters we haven't even implemented yet
     get '/go/' + short_link + "?foobar=yes"