cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add tests for new redirects and fix a few bugs in the redirects

Browse source
This commit is contained in:
Tom Hughes 2013-11-28 08:56:52 +00:00
parent 3cd5f45e08
commit fb9b4edcdd
2 changed files with 55 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/routes.rb
View file

@ -123,10 +123,10 @@ OpenStreetMap::Application.routes.draw do
get '/browse/node/:id/history', :to => redirect('/node/%{id}/history') get '/browse/node/:id/history', :to => redirect('/node/%{id}/history')
get '/browse/relation/:id', :to => redirect('/relation/%{id}') get '/browse/relation/:id', :to => redirect('/relation/%{id}')
get '/browse/relation/:id/history', :to => redirect('/relation/%{id}/history') 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 '/browse/note/:id', :to => redirect('/note/%{id}')
get '/user/:display_name/edits', :to => redirect('/user/:display_name/history') 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/feed', :to => redirect('/user/%{display_name}/history/feed')
get '/browse/friends', :to => redirect('/history/friends') get '/browse/friends', :to => redirect('/history/friends')
get '/browse/nearby', :to => redirect('/history/nearby') get '/browse/nearby', :to => redirect('/history/nearby')
get '/browse/changesets/feed', :to => redirect('/history/feed') get '/browse/changesets/feed', :to => redirect('/history/feed')

52
test/integration/redirect_test.rb
View file

@ -9,11 +9,63 @@ class RedirectTest < ActionDispatch::IntegrationTest
get "/browse/changesets" get "/browse/changesets"
assert_response :redirect assert_response :redirect
assert_redirected_to "/history" 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 end
def test_history_feed_redirects def test_history_feed_redirects
get "/browse/changesets/feed" get "/browse/changesets/feed"
assert_response :redirect assert_response :redirect
assert_redirected_to "/history/feed" 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
end end