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

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

diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb
index 5a9ba17ec4276a55b069e4183058df84fd920f6b..71640b67d96aa8edee1ecc61d2d52ff29c092237 100644 (file)
--- a/test/integration/redirect_test.rb
+++ b/test/integration/redirect_test.rb
@@ -1,6 +1,20 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"
+
+class RedirectTest < ActionDispatch::IntegrationTest
+  def test_legacy_redirects
+    get "/index.html"
+    assert_response :redirect
+    assert_redirected_to "/"
+
+    get "/create-account.html"
+    assert_response :redirect
+    assert_redirected_to "/user/new"
+
+    get "/forgot-password.html"
+    assert_response :redirect
+    assert_redirected_to "/user/forgot-password"
+  end
 
-class RedirectTest  < ActionDispatch::IntegrationTest
   def test_search_redirects
     get "/?query=test"
     assert_response :redirect
@@ -31,6 +45,10 @@ class RedirectTest  < ActionDispatch::IntegrationTest
     get "/user/name/edits"
     assert_response :redirect
     assert_redirected_to "/user/name/history"
+
+    get "/user/name%20with%20spaces/edits"
+    assert_response :redirect
+    assert_redirected_to "/user/name%20with%20spaces/history"
   end
 
   def test_history_feed_redirects
@@ -45,6 +63,10 @@ class RedirectTest  < ActionDispatch::IntegrationTest
     get "/user/name/edits/feed"
     assert_response :redirect
     assert_redirected_to "/user/name/history/feed"
+
+    get "/user/name%20with%20spaces/edits/feed"
+    assert_response :redirect
+    assert_redirected_to "/user/name%20with%20spaces/history/feed"
   end
 
   def test_browse_redirects