From f61d6f06b5301b283a7702a36c5a45f1c33544b9 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 30 Jan 2014 17:29:16 -0300
Subject: [PATCH] rails3: fix tests of profile_members_controller

---
 app/views/profile_members/_members_list.html.erb   | 6 +++---
 test/functional/profile_members_controller_test.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/profile_members/_members_list.html.erb b/app/views/profile_members/_members_list.html.erb
index 161a389..cbb42c3 100644
--- a/app/views/profile_members/_members_list.html.erb
+++ b/app/views/profile_members/_members_list.html.erb
@@ -17,9 +17,9 @@
           <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
           <%= button_to_remote_without_text(:remove, _('Remove'),
                 :update => 'members-list',
-                :loading => '$("members-list").addClassName("loading")',
-                :success => "$('tr-#{m.identifier}').show()",
-                :complete => '$("members-list").removeClassName("loading")',
+                :loading => j('$("members-list").addClassName("loading")'),
+                :success => j("$('tr-#{m.identifier}').show()"),
+                :complete => j('$("members-list").removeClassName("loading")'),
                 :url => { :id => m }.merge(remove_action)) if m != user %>
         </div>
       </td>
diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb
index fb347b7..0177d81 100644
--- a/test/functional/profile_members_controller_test.rb
+++ b/test/functional/profile_members_controller_test.rb
@@ -122,7 +122,7 @@ class ProfileMembersControllerTest < ActionController::TestCase
     get :unassociate, :profile => com.identifier, :id => member
 
     assert_response :success
-    assert_equal nil, @response.layout
+    assert_template :layout => nil
     member.reload
     com.reload
     assert_not_includes com.members, member
@@ -339,12 +339,12 @@ class ProfileMembersControllerTest < ActionController::TestCase
     ent = fast_create(Enterprise, :name => 'Test Ent', :identifier => 'test_ent')
     p = create_user_with_permission('test_user', 'manage_memberships', ent)
     login_as :test_user
-    r = ent.environment.roles.create!(:name => 'test_role', :permissions => ['some_perm'])
+    r = ent.environment.roles.create!(:name => 'test_role', :permissions => ['edit_profile'])
     get :update_roles, :profile => ent.identifier, :person => p.id, :roles => ["0", r.id, nil]
 
     p_roles = p.find_roles(ent).map(&:role).uniq
 
-    assert p_roles, [r]
+    assert_equal [r], p_roles
   end
 
   should 'set a community member as admin' do
--
libgit2 0.21.2