Don't render memberships forms, use #edit instead.

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

4 files changed, 26 insertions, 1 deletions

diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb
index d132c8293..6de763fd1 100644
--- a/test/functional/members_controller_test.rb
+++ b/test/functional/members_controller_test.rb
@@ -110,6 +110,17 @@ class MembersControllerTest < Redmine::ControllerTest
     assert_match /alert/, response.body, "Alert message not sent"
   end
 
+  def test_edit
+    get :edit, :id => 2
+    assert_response :success
+    assert_select 'input[name=?][value=?][checked=checked]', 'membership[role_ids][]', '2'
+  end
+
+  def test_xhr_edit
+    xhr :get, :edit, :id => 2
+    assert_response :success
+  end
+
   def test_update
     assert_no_difference 'Member.count' do
       put :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
diff --git a/test/functional/principal_memberships_controller_test.rb b/test/functional/principal_memberships_controller_test.rb
index f20a52099..ca0b2c53a 100644
--- a/test/functional/principal_memberships_controller_test.rb
+++ b/test/functional/principal_memberships_controller_test.rb
@@ -105,6 +105,17 @@ class PrincipalMembershipsControllerTest < Redmine::ControllerTest
     assert_include 'Role cannot be empty', response.body, "Error message not sent"
   end
 
+  def test_edit_user_membership
+    get :edit, :user_id => 2, :id => 1
+    assert_response :success
+    assert_select 'input[name=?][value=?][checked=checked]', 'membership[role_ids][]', '1'
+  end
+
+  def test_xhr_edit_user_membership
+    xhr :get, :edit, :user_id => 2, :id => 1
+    assert_response :success
+  end
+
   def test_update_user_membership
     assert_no_difference 'Member.count' do
       put :update, :user_id => 2, :id => 1, :membership => {:role_ids => [2]}
@@ -120,7 +131,7 @@ class PrincipalMembershipsControllerTest < Redmine::ControllerTest
       assert_equal 'text/javascript', response.content_type
     end
     assert_equal [2], Member.find(1).role_ids
-    assert_include 'tab-content-memberships', response.body
+    assert_include '$("#member-1-roles").html("Developer").show();', response.body
   end
 
   def test_destroy_user_membership
diff --git a/test/integration/routing/members_test.rb b/test/integration/routing/members_test.rb
index ae3eb5b5e..985d697e0 100644
--- a/test/integration/routing/members_test.rb
+++ b/test/integration/routing/members_test.rb
@@ -22,6 +22,7 @@ class RoutingMembersTest < Redmine::RoutingTest
     should_route 'GET /projects/foo/memberships/new' => 'members#new', :project_id => 'foo'
     should_route 'POST /projects/foo/memberships' => 'members#create', :project_id => 'foo'
 
+    should_route 'GET /memberships/5234/edit' => 'members#edit', :id => '5234'
     should_route 'PUT /memberships/5234' => 'members#update', :id => '5234'
     should_route 'DELETE /memberships/5234' => 'members#destroy', :id => '5234'
 
diff --git a/test/integration/routing/principal_memberships_test.rb b/test/integration/routing/principal_memberships_test.rb
index b40eb2ca3..db91c850b 100644
--- a/test/integration/routing/principal_memberships_test.rb
+++ b/test/integration/routing/principal_memberships_test.rb
@@ -21,6 +21,7 @@ class RoutingPrincipalMembershipsTest < Redmine::RoutingTest
   def test_user_memberships
     should_route 'GET /users/123/memberships/new' => 'principal_memberships#new', :user_id => '123'
     should_route 'POST /users/123/memberships' => 'principal_memberships#create', :user_id => '123'
+    should_route 'GET /users/123/memberships/55/edit' => 'principal_memberships#edit', :user_id => '123', :id => '55'
     should_route 'PUT /users/123/memberships/55' => 'principal_memberships#update', :user_id => '123', :id => '55'
     should_route 'DELETE /users/123/memberships/55' => 'principal_memberships#destroy', :user_id => '123', :id => '55'
   end
@@ -28,6 +29,7 @@ class RoutingPrincipalMembershipsTest < Redmine::RoutingTest
   def test_group_memberships
     should_route 'GET /groups/123/memberships/new' => 'principal_memberships#new', :group_id => '123'
     should_route 'POST /groups/123/memberships' => 'principal_memberships#create', :group_id => '123'
+    should_route 'GET /groups/123/memberships/55/edit' => 'principal_memberships#edit', :group_id => '123', :id => '55'
     should_route 'PUT /groups/123/memberships/55' => 'principal_memberships#update', :group_id => '123', :id => '55'
     should_route 'DELETE /groups/123/memberships/55' => 'principal_memberships#destroy', :group_id => '123', :id => '55'
   end