Adds a single controller for users and groups memberships and support for adding multiple projects at once (#11702).

git-svn-id: http://svn.redmine.org/redmine/trunk@13498 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/integration/routing/groups_test.rb

@@ -94,13 +94,5 @@ class RoutingGroupsTest < ActionDispatch::IntegrationTest
         { :method => 'delete', :path => "/groups/567/users/12.xml" },
         { :controller => 'groups', :action => 'remove_user', :id => '567', :user_id => '12', :format => 'xml' }
       )
-    assert_routing(
-        { :method => 'post', :path => "/groups/destroy_membership/567" },
-        { :controller => 'groups', :action => 'destroy_membership', :id => '567' }
-      )
-    assert_routing(
-        { :method => 'post', :path => "/groups/edit_membership/567" },
-        { :controller => 'groups', :action => 'edit_membership', :id => '567' }
-      )
   end
 end

test/integration/routing/principal_memberships_test.rb

@@ -0,0 +1,56 @@
+# Redmine - project management software
+# Copyright (C) 2006-2014  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../../test_helper', __FILE__)
+
+class RoutingPrincipalMembershipsTest < ActionDispatch::IntegrationTest
+  def test_user_memberships
+    assert_routing(
+        { :method => 'post', :path => "/users/123/memberships" },
+        { :controller => 'principal_memberships', :action => 'create',
+          :user_id => '123' }
+      )
+    assert_routing(
+        { :method => 'put', :path => "/users/123/memberships/55" },
+        { :controller => 'principal_memberships', :action => 'update',
+          :user_id => '123', :id => '55' }
+      )
+    assert_routing(
+        { :method => 'delete', :path => "/users/123/memberships/55" },
+        { :controller => 'principal_memberships', :action => 'destroy',
+          :user_id => '123', :id => '55' }
+      )
+  end
+
+  def test_group_memberships
+    assert_routing(
+        { :method => 'post', :path => "/groups/123/memberships" },
+        { :controller => 'principal_memberships', :action => 'create',
+          :group_id => '123' }
+      )
+    assert_routing(
+        { :method => 'put', :path => "/groups/123/memberships/55" },
+        { :controller => 'principal_memberships', :action => 'update',
+          :group_id => '123', :id => '55' }
+      )
+    assert_routing(
+        { :method => 'delete', :path => "/groups/123/memberships/55" },
+        { :controller => 'principal_memberships', :action => 'destroy',
+          :group_id => '123', :id => '55' }
+      )
+  end
+end

test/integration/routing/users_test.rb

@@ -79,20 +79,5 @@ class RoutingUsersTest < ActionDispatch::IntegrationTest
         { :controller => 'users', :action => 'destroy', :id => '44',
           :format => 'xml' }
       )
-    assert_routing(
-        { :method => 'post', :path => "/users/123/memberships" },
-        { :controller => 'users', :action => 'edit_membership',
-          :id => '123' }
-      )
-    assert_routing(
-        { :method => 'put', :path => "/users/123/memberships/55" },
-        { :controller => 'users', :action => 'edit_membership',
-          :id => '123', :membership_id => '55' }
-      )
-    assert_routing(
-        { :method => 'delete', :path => "/users/123/memberships/55" },
-        { :controller => 'users', :action => 'destroy_membership',
-          :id => '123', :membership_id => '55' }
-      )
   end
 end