comparison test/functional/groups_controller_test.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

 # 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
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require File.expand_path('../../test_helper', __FILE__)
 
 class GroupsControllerTest < ActionController::TestCase
-  fixtures :projects, :users, :members, :member_roles, :groups_users
+  fixtures :projects, :users, :members, :member_roles, :roles, :groups_users
 
   def setup
     @request.session[:user_id] = 1
   end
 

     get :show, :id => 10
     assert_response :success
     assert_template 'show'
   end
 
+  def test_show_invalid_should_return_404
+    get :show, :id => 99
+    assert_response 404
+  end
+
   def test_new
     get :new
     assert_response :success
     assert_template 'new'
+    assert_select 'input[name=?]', 'group[name]'
   end
 
   def test_create
     assert_difference 'Group.count' do
-      post :create, :group => {:lastname => 'New group'}
+      post :create, :group => {:name => 'New group'}
     end
     assert_redirected_to '/groups'
     group = Group.first(:order => 'id DESC')
     assert_equal 'New group', group.name
     assert_equal [], group.users
   end
 
   def test_create_and_continue
     assert_difference 'Group.count' do
-      post :create, :group => {:lastname => 'New group'}, :continue => 'Create and continue'
+      post :create, :group => {:name => 'New group'}, :continue => 'Create and continue'
     end
     assert_redirected_to '/groups/new'
     group = Group.first(:order => 'id DESC')
     assert_equal 'New group', group.name
   end
 
   def test_create_with_failure
     assert_no_difference 'Group.count' do
-      post :create, :group => {:lastname => ''}
+      post :create, :group => {:name => ''}
     end
     assert_response :success
     assert_template 'new'
   end
 

     assert_tag 'div', :attributes => {:id => 'tab-content-memberships'}
   end
 
   def test_update
     new_name = 'New name'
-    put :update, :id => 10, :group => {:lastname => new_name}
+    put :update, :id => 10, :group => {:name => new_name}
     assert_redirected_to '/groups'
     group = Group.find(10)
     assert_equal new_name, group.name
   end
 
   def test_update_with_failure
-    put :update, :id => 10, :group => {:lastname => ''}
+    put :update, :id => 10, :group => {:name => ''}
     assert_response :success
     assert_template 'edit'
   end
 
   def test_destroy

   end
 
   def test_xhr_add_users
     assert_difference 'Group.find(10).users.count', 2 do
       xhr :post, :add_users, :id => 10, :user_ids => ['2', '3']
-    end
-    assert_select_rjs :replace_html, 'tab-content-users'
+      assert_response :success
+      assert_template 'add_users'
+      assert_equal 'text/javascript', response.content_type
+    end
+    assert_match /John Smith/, response.body
   end
 
   def test_remove_user
     assert_difference 'Group.find(10).users.count', -1 do
       delete :remove_user, :id => 10, :user_id => '8'

   end
 
   def test_xhr_remove_user
     assert_difference 'Group.find(10).users.count', -1 do
       xhr :delete, :remove_user, :id => 10, :user_id => '8'
-    end
-    assert_select_rjs :replace_html, 'tab-content-users'
+      assert_response :success
+      assert_template 'remove_user'
+      assert_equal 'text/javascript', response.content_type
+    end
   end
 
   def test_new_membership
     assert_difference 'Group.find(10).members.count' do
       post :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}

   end
 
   def test_xhr_new_membership
     assert_difference 'Group.find(10).members.count' do
       xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
-    end
-    assert_select_rjs :replace_html, 'tab-content-memberships'
+      assert_response :success
+      assert_template 'edit_membership'
+      assert_equal 'text/javascript', response.content_type
+    end
+    assert_match /OnlineStore/, response.body
   end
 
   def test_xhr_new_membership_with_failure
     assert_no_difference 'Group.find(10).members.count' do
       xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 999, :role_ids => ['1', '2']}
-    end
-    assert @response.body.match(/alert/i), "Alert message not sent"
+      assert_response :success
+      assert_template 'edit_membership'
+      assert_equal 'text/javascript', response.content_type
+    end
+    assert_match /alert/, response.body, "Alert message not sent"
   end
 
   def test_edit_membership
     assert_no_difference 'Group.find(10).members.count' do
       post :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
     end
   end
 
+  def test_xhr_edit_membership
+    assert_no_difference 'Group.find(10).members.count' do
+      xhr :post, :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
+      assert_response :success
+      assert_template 'edit_membership'
+      assert_equal 'text/javascript', response.content_type
+    end
+  end
+
   def test_destroy_membership
     assert_difference 'Group.find(10).members.count', -1 do
       post :destroy_membership, :id => 10, :membership_id => 6
     end
   end
 
   def test_xhr_destroy_membership
     assert_difference 'Group.find(10).members.count', -1 do
       xhr :post, :destroy_membership, :id => 10, :membership_id => 6
-    end
-    assert_select_rjs :replace_html, 'tab-content-memberships'
+      assert_response :success
+      assert_template 'destroy_membership'
+      assert_equal 'text/javascript', response.content_type
+    end
   end
 
   def test_autocomplete_for_user
     get :autocomplete_for_user, :id => 10, :q => 'mis'
     assert_response :success