diff test/functional/members_controller_test.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

--- a/test/functional/members_controller_test.rb	Wed Jun 27 14:54:18 2012 +0100
+++ b/test/functional/members_controller_test.rb	Mon Jan 07 12:01:42 2013 +0000
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  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
@@ -35,7 +35,7 @@
 
   def test_create
     assert_difference 'Member.count' do
-      post :new, :id => 1, :member => {:role_ids => [1], :user_id => 7}
+      post :create, :project_id => 1, :membership => {:role_ids => [1], :user_id => 7}
     end
     assert_redirected_to '/projects/ecookbook/settings/members'
     assert User.find(7).member_of?(Project.find(1))
@@ -43,7 +43,7 @@
 
   def test_create_multiple
     assert_difference 'Member.count', 3 do
-      post :new, :id => 1, :member => {:role_ids => [1], :user_ids => [7, 8, 9]}
+      post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
     end
     assert_redirected_to '/projects/ecookbook/settings/members'
     assert User.find(7).member_of?(Project.find(1))
@@ -51,42 +51,50 @@
 
   def test_xhr_create
     assert_difference 'Member.count', 3 do
-      post :new, :format => "js", :id => 1, :member => {:role_ids => [1], :user_ids => [7, 8, 9]}
+      xhr :post, :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
+      assert_response :success
+      assert_template 'create'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_select_rjs :replace_html, 'tab-content-members'
     assert User.find(7).member_of?(Project.find(1))
     assert User.find(8).member_of?(Project.find(1))
     assert User.find(9).member_of?(Project.find(1))
+    assert_include 'tab-content-members', response.body
   end
 
   def test_xhr_create_with_failure
     assert_no_difference 'Member.count' do
-      post :new, :format => "js", :id => 1, :member => {:role_ids => [], :user_ids => [7, 8, 9]}
+      xhr :post, :create, :project_id => 1, :membership => {:role_ids => [], :user_ids => [7, 8, 9]}
+      assert_response :success
+      assert_template 'create'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_select '#tab-content-members', 0
-    assert @response.body.match(/alert/i), "Alert message not sent"
+    assert_match /alert/, response.body, "Alert message not sent"
   end
 
   def test_edit
     assert_no_difference 'Member.count' do
-      post :edit, :id => 2, :member => {:role_ids => [1], :user_id => 3}
+      put :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
     end
     assert_redirected_to '/projects/ecookbook/settings/members'
   end
 
   def test_xhr_edit
     assert_no_difference 'Member.count' do
-      xhr :post, :edit, :id => 2, :member => {:role_ids => [1], :user_id => 3}
+      xhr :put, :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
+      assert_response :success
+      assert_template 'update'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_select_rjs :replace_html, 'tab-content-members'
     member = Member.find(2)
     assert_equal [1], member.role_ids
     assert_equal 3, member.user_id
+    assert_include 'tab-content-members', response.body
   end
 
   def test_destroy
     assert_difference 'Member.count', -1 do
-      post :destroy, :id => 2
+      delete :destroy, :id => 2
     end
     assert_redirected_to '/projects/ecookbook/settings/members'
     assert !User.find(3).member_of?(Project.find(1))
@@ -94,17 +102,21 @@
 
   def test_xhr_destroy
     assert_difference 'Member.count', -1 do
-      xhr :post, :destroy, :id => 2
+      xhr :delete, :destroy, :id => 2
+      assert_response :success
+      assert_template 'destroy'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_select_rjs :replace_html, 'tab-content-members'
+    assert_nil Member.find_by_id(2)
+    assert_include 'tab-content-members', response.body
   end
 
-  def test_autocomplete_for_member
-    get :autocomplete_for_member, :id => 1, :q => 'mis'
+  def test_autocomplete
+    get :autocomplete, :project_id => 1, :q => 'mis'
     assert_response :success
-    assert_template 'autocomplete_for_member'
+    assert_template 'autocomplete'
 
     assert_tag :label, :content => /User Misc/,
-                       :child => { :tag => 'input', :attributes => { :name => 'member[user_ids][]', :value => '8' } }
+                       :child => { :tag => 'input', :attributes => { :name => 'membership[user_ids][]', :value => '8' } }
   end
 end