Merge 16216:16355 from trunk.

2009-07-05 23:47:40 +00:00 · 2009-07-05 23:47:40 +00:00 · 9a32033209
commit 9a32033209
parent d63f605893 ff401e541b
37 changed files with 1442 additions and 307 deletions
--- 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

  ##