Converted routing and urls to follow the Rails REST convention.

Patch supplied by commits from Gerrit Kaiser on Github.  Existing routes will
still work (backwards compatible) but any new urls will be generated using the
new routing rules.

Changes listed below:

* made the URLs for some project tabs and project settings follow the new rails RESTful conventions of /collection/:id/subcollection/:sub_id
* prettier URL for project roadmap
* more nice project URLs
* use GET for filtering form
* prettified URLs used on issues tab
* custom route for activity atom feeds
* prettier repository urls
* fixed broken route definition
* fixed failing tests for issuecontroller that were hardcoding the url string
* more RESTful routes for boards and messages
* RESTful routes for wiki pages
* RESTful routes for documents
* moved old routes that are retained for compatibility to the bottom and grouped them together
* added RESTful URIs for issues
* RESTfulness for the news section
* fixed route order
* changed hardcoded URLs in tests
* fixed badly written tests
* fixed forgotten parameter in routes
* changed hardcoded URLS to new scheme
* changed project add url to the standard POST to collection
* create new issue by POSTing to collection
* changed hardcoded URLs in integrations tests
* made project add form work again
* restful routes for project deletion
* prettier routes for project (un)archival
* made routes table more readable
* fixed note quoting
* user routing
* fixed bug
* always sort by GET
* Fixed: cross-project issue list should not show issues of projects for which the issue tracking module was disabled.
* prettified URLs used on issues tab
* urls for time log
* fixed reply routing
* eliminate revision query paremeter for diff and entry actions
* fixed test failures with hard-coded urls
* ensure ajax links always use get
* refactored ajax link generation into separate method

  #1901


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2317 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 72 insertions, 2 deletions

diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 82f3e9ee2..42e69f48d 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -32,11 +32,27 @@ class UsersControllerTest < Test::Unit::TestCase
     @request.session[:user_id] = 1 # admin
   end
   
+  def test_index_routing
+    #TODO: unify with list
+    assert_generates(
+      '/users',
+      :controller => 'users', :action => 'index'
+    )
+  end
+  
   def test_index
     get :index
     assert_response :success
     assert_template 'list'
   end
+  
+  def test_list_routing
+    #TODO: rename action to index
+    assert_routing(
+      {:method => :get, :path => '/users'},
+      :controller => 'users', :action => 'list'
+    )
+  end
 
   def test_list
     get :list
@@ -56,17 +72,71 @@ class UsersControllerTest < Test::Unit::TestCase
     assert_equal 1, users.size
     assert_equal 'John', users.first.firstname
   end
+
+  def test_add_routing
+    assert_routing(
+      {:method => :get, :path => '/users/new'},
+      :controller => 'users', :action => 'add'
+    )
+    assert_recognizes(
+    #TODO: remove this and replace with POST to collection, need to modify form
+      {:controller => 'users', :action => 'add'},
+      {:method => :post, :path => '/users/new'}
+    )
+    assert_recognizes(
+      {:controller => 'users', :action => 'add'},
+      {:method => :post, :path => '/users'}
+    )
+  end
+  
+  def test_edit_routing
+    assert_routing(
+      {:method => :get, :path => '/users/444/edit'},
+      :controller => 'users', :action => 'edit', :id => '444'
+    )
+    assert_routing(
+      {:method => :get, :path => '/users/222/edit/membership'},
+      :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'
+    )
+    assert_recognizes(
+    #TODO: use PUT on user_path, modify form
+      {:controller => 'users', :action => 'edit', :id => '444'},
+      {:method => :post, :path => '/users/444/edit'}
+    )
+  end
+  
+  def test_add_membership_routing
+    assert_routing(
+      {:method => :post, :path => '/users/123/memberships'},
+      :controller => 'users', :action => 'edit_membership', :id => '123'
+    )
+  end
+  
+  def test_edit_membership_routing
+    assert_routing(
+      {:method => :post, :path => '/users/123/memberships/55'},
+      :controller => 'users', :action => 'edit_membership', :id => '123', :membership_id => '55'
+    )
+  end
   
   def test_edit_membership
     post :edit_membership, :id => 2, :membership_id => 1,
                            :membership => { :role_id => 2}
-    assert_redirected_to '/users/edit/2?tab=memberships'
+    assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
     assert_equal 2, Member.find(1).role_id
   end
   
   def test_destroy_membership
+    assert_routing(
+    #TODO: use DELETE method on user_membership_path, modify form
+      {:method => :post, :path => '/users/567/memberships/12/destroy'},
+      :controller => 'users', :action => 'destroy_membership', :id => '567', :membership_id => '12'
+    )
+  end
+  
+  def test_destroy_membership
     post :destroy_membership, :id => 2, :membership_id => 1
-    assert_redirected_to '/users/edit/2?tab=memberships'
+    assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
     assert_nil Member.find_by_id(1)
   end
 end