merge r17141:17256 from trunk

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

diff --git a/test/integration/short_link_test.rb b/test/integration/short_link_test.rb
index 91f939a529265ed786ced63a5131a9bb0026a8b9..3f2d65a27c323da7d5eb7be63a8ff56a03a1c9dd 100644 (file)
--- a/test/integration/short_link_test.rb
+++ b/test/integration/short_link_test.rb
@@ -6,7 +6,7 @@ class ShortLinkTest < ActionController::IntegrationTest
   # kept in the redirect.
   def test_short_link_params
     assert_short_link_redirect('1N8H@P_5W')
-    assert_short_link_redirect('euu4oTas==')
+    assert_short_link_redirect(ShortLink::encode(-0.107846, 51.50771, 18))
   end
 
   ##