Download as
Browse Code »

Commit f61d6f06b5301b283a7702a36c5a45f1c33544b9

Authored by Victor Costa
1 parent fa8d3216
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix tests of profile_members_controller

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
app/views/profile_members/_members_list.html.erb
  Diff comments   View file @f61d6f0
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %> 17 <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
18 <%= button_to_remote_without_text(:remove, _('Remove'), 18 <%= button_to_remote_without_text(:remove, _('Remove'),
19 :update => 'members-list', 19 :update => 'members-list',
20 - :loading => '$("members-list").addClassName("loading")',  
21 - :success => "$('tr-#{m.identifier}').show()",  
22 - :complete => '$("members-list").removeClassName("loading")', 20 + :loading => j('$("members-list").addClassName("loading")'),
  21 + :success => j("$('tr-#{m.identifier}').show()"),
  22 + :complete => j('$("members-list").removeClassName("loading")'),
23 :url => { :id => m }.merge(remove_action)) if m != user %> 23 :url => { :id => m }.merge(remove_action)) if m != user %>
24 </div> 24 </div>
25 </td> 25 </td>
test/functional/profile_members_controller_test.rb
  Diff comments   View file @f61d6f0
@@ -122,7 +122,7 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase @@ -122,7 +122,7 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
122 get :unassociate, :profile => com.identifier, :id => member 122 get :unassociate, :profile => com.identifier, :id => member
123 123
124 assert_response :success 124 assert_response :success
125 - assert_equal nil, @response.layout 125 + assert_template :layout => nil
126 member.reload 126 member.reload
127 com.reload 127 com.reload
128 assert_not_includes com.members, member 128 assert_not_includes com.members, member
@@ -339,12 +339,12 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase @@ -339,12 +339,12 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
339 ent = fast_create(Enterprise, :name => 'Test Ent', :identifier => 'test_ent') 339 ent = fast_create(Enterprise, :name => 'Test Ent', :identifier => 'test_ent')
340 p = create_user_with_permission('test_user', 'manage_memberships', ent) 340 p = create_user_with_permission('test_user', 'manage_memberships', ent)
341 login_as :test_user 341 login_as :test_user
342 - r = ent.environment.roles.create!(:name => 'test_role', :permissions => ['some_perm']) 342 + r = ent.environment.roles.create!(:name => 'test_role', :permissions => ['edit_profile'])
343 get :update_roles, :profile => ent.identifier, :person => p.id, :roles => ["0", r.id, nil] 343 get :update_roles, :profile => ent.identifier, :person => p.id, :roles => ["0", r.id, nil]
344 344
345 p_roles = p.find_roles(ent).map(&:role).uniq 345 p_roles = p.find_roles(ent).map(&:role).uniq
346 346
347 - assert p_roles, [r] 347 + assert_equal [r], p_roles
348 end 348 end
349 349
350 should 'set a community member as admin' do 350 should 'set a community member as admin' do