Download as
Browse Code »

Commit f7096d226758de082e5ceb460f622a7c890929f3

Authored by Daniela Feitosa
2 parents 4250b447 71ea819b
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

Merge commit 'refs/merge-requests/20' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/20
Showing 2 changed files with 17 additions and 2 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @f7096d2
@@ -74,6 +74,10 @@ class Environment < ActiveRecord::Base @@ -74,6 +74,10 @@ class Environment < ActiveRecord::Base
74 self.affiliate(user, Environment::Roles.admin(self.id)) 74 self.affiliate(user, Environment::Roles.admin(self.id))
75 end 75 end
76 76
  77 + def remove_admin(user)
  78 + self.disaffiliate(user, Environment::Roles.admin(self.id))
  79 + end
  80 +
77 def admins 81 def admins
78 Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id]) 82 Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', Environment::Roles.admin(self).id])
79 end 83 end
test/unit/environment_test.rb
  Diff comments   View file @f7096d2
@@ -372,8 +372,7 @@ class EnvironmentTest < Test::Unit::TestCase @@ -372,8 +372,7 @@ class EnvironmentTest < Test::Unit::TestCase
372 end 372 end
373 373
374 should 'be able to add admins easily' do 374 should 'be able to add admins easily' do
375 - Environment.any_instance.stubs(:create_templates) # avoid creating templates, it's expensive  
376 - env = Environment.create!(:name => 'bli') 375 + env = Environment.default
377 user = create_user('testuser').person 376 user = create_user('testuser').person
378 env.add_admin(user) 377 env.add_admin(user)
379 env.reload 378 env.reload
@@ -381,6 +380,18 @@ class EnvironmentTest < Test::Unit::TestCase @@ -381,6 +380,18 @@ class EnvironmentTest < Test::Unit::TestCase
381 assert_includes env.admins, user 380 assert_includes env.admins, user
382 end 381 end
383 382
  383 + should 'be able to remove admins easily' do
  384 + env = Environment.default
  385 + user = create_user('testuser').person
  386 + env.affiliate(user, Environment::Roles.admin(env.id))
  387 + env.reload
  388 + assert_includes env.admins, user
  389 +
  390 + env.remove_admin(user)
  391 + assert_not_includes env.admins, user
  392 + end
  393 +
  394 +
384 should 'have products through enterprises' do 395 should 'have products through enterprises' do
385 product_category = fast_create(ProductCategory, :name => 'Products', :environment_id => Environment.default.id) 396 product_category = fast_create(ProductCategory, :name => 'Products', :environment_id => Environment.default.id)
386 env = Environment.default 397 env = Environment.default