diff test/functional/groups_controller_test.rb @ 1526:404aa68d4227

Merge from live branch

--- a/test/functional/groups_controller_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/functional/groups_controller_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -53,7 +53,7 @@
       post :create, :group => {:name => 'New group'}
     end
     assert_redirected_to '/groups'
-    group = Group.first(:order => 'id DESC')
+    group = Group.order('id DESC').first
     assert_equal 'New group', group.name
     assert_equal [], group.users
   end
@@ -63,7 +63,7 @@
       post :create, :group => {:name => 'New group'}, :continue => 'Create and continue'
     end
     assert_redirected_to '/groups/new'
-    group = Group.first(:order => 'id DESC')
+    group = Group.order('id DESC').first
     assert_equal 'New group', group.name
   end
 
@@ -79,8 +79,11 @@
     get :edit, :id => 10
     assert_response :success
     assert_template 'edit'
-    assert_tag 'div', :attributes => {:id => 'tab-content-users'}
-    assert_tag 'div', :attributes => {:id => 'tab-content-memberships'}
+
+    assert_select 'div#tab-content-users'
+    assert_select 'div#tab-content-memberships' do
+      assert_select 'a', :text => 'Private child of eCookbook'
+    end
   end
 
   def test_update
@@ -192,11 +195,8 @@
   end
 
   def test_autocomplete_for_user
-    get :autocomplete_for_user, :id => 10, :q => 'mis'
+    get :autocomplete_for_user, :id => 10, :q => 'smi', :format => 'js'
     assert_response :success
-    users = assigns(:users)
-    assert_not_nil users
-    assert users.any?
-    assert !users.include?(Group.find(10).users.first)
+    assert_include 'John Smith', response.body
   end
 end