From fb9b4edcdd95884759fc5013ac2bf86b26ea0bce Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Nov 2013 08:56:52 +0000
Subject: [PATCH] Add tests for new redirects and fix a few bugs in the
 redirects

---
 config/routes.rb                  |  6 ++--
 test/integration/redirect_test.rb | 52 +++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 5551c7c55..bae002b7c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -123,10 +123,10 @@ OpenStreetMap::Application.routes.draw do
   get '/browse/node/:id/history',       :to => redirect('/node/%{id}/history')
   get '/browse/relation/:id',           :to => redirect('/relation/%{id}')
   get '/browse/relation/:id/history',   :to => redirect('/relation/%{id}/history')
-  get '/browse/changset/:id',           :to => redirect('/changeset/%{id}')
+  get '/browse/changeset/:id',          :to => redirect('/changeset/%{id}')
   get '/browse/note/:id',               :to => redirect('/note/%{id}')
-  get '/user/:display_name/edits',      :to => redirect('/user/:display_name/history')
-  get '/user/:display_name/edits/feed', :to => redirect('/user/:display_name/history/feed')
+  get '/user/:display_name/edits',      :to => redirect('/user/%{display_name}/history')
+  get '/user/:display_name/edits/feed', :to => redirect('/user/%{display_name}/history/feed')
   get '/browse/friends',                :to => redirect('/history/friends')
   get '/browse/nearby',                 :to => redirect('/history/nearby')
   get '/browse/changesets/feed',        :to => redirect('/history/feed')
diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb
index 604cebd76..42199ce4e 100644
--- a/test/integration/redirect_test.rb
+++ b/test/integration/redirect_test.rb
@@ -9,11 +9,63 @@ class RedirectTest  < ActionDispatch::IntegrationTest
     get "/browse/changesets"
     assert_response :redirect
     assert_redirected_to "/history"
+
+    get "/browse/friends"
+    assert_response :redirect
+    assert_redirected_to "/history/friends"
+
+    get "/browse/nearby"
+    assert_response :redirect
+    assert_redirected_to "/history/nearby"
+
+    get "/user/name/edits"
+    assert_response :redirect
+    assert_redirected_to "/user/name/history"
   end
 
   def test_history_feed_redirects
     get "/browse/changesets/feed"
     assert_response :redirect
     assert_redirected_to "/history/feed"
+
+    get "/user/name/edits/feed"
+    assert_response :redirect
+    assert_redirected_to "/user/name/history/feed"
+  end
+
+  def test_browse_redirects
+    get "/browse/node/1"
+    assert_response :redirect
+    assert_redirected_to "/node/1"
+
+    get "/browse/way/1"
+    assert_response :redirect
+    assert_redirected_to "/way/1"
+
+    get "/browse/relation/1"
+    assert_response :redirect
+    assert_redirected_to "/relation/1"
+
+    get "/browse/changeset/1"
+    assert_response :redirect
+    assert_redirected_to "/changeset/1"
+
+    get "/browse/note/1"
+    assert_response :redirect
+    assert_redirected_to "/note/1"
+  end
+
+  def test_browse_history_redirects
+    get "/browse/node/1/history"
+    assert_response :redirect
+    assert_redirected_to "/node/1/history"
+
+    get "/browse/way/1/history"
+    assert_response :redirect
+    assert_redirected_to "/way/1/history"
+
+    get "/browse/relation/1/history"
+    assert_response :redirect
+    assert_redirected_to "/relation/1/history"
   end
 end
-- 
2.43.2