ActionItem384: member leave from community/enterprise

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1782 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem384: member leave from community/enterprise
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1782 3f533792-8f58-4932-b0fe-aaf55b0a4547
JoenioCosta
1 parent 2519b304
Showing 3 changed files with 8 additions and 3 deletions Show diff stats
test/functional/memberships_controller_test.rb
test/unit/profile_test.rb
vendor/plugins/access_control/lib/acts_as_accessible.rb
@@ -122,6 +122,7 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
  
   should 'present confirmation before leaving a profile' do
     community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
     get :leave, :profile => profile.identifier, :id => community.id
  
     assert_response :success
@@ -130,13 +131,15 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
  
   should 'actually leave profile' do
     community = Community.create!(:name => 'my test community')
+    community.add_member(profile)
+    assert_includes profile.memberships, community
     post :leave, :profile => profile.identifier, :id => community.id, :confirmation => '1'
  
     assert_response :redirect
     assert_redirected_to :action => 'index'
  
     profile.reload
-    assert !profile.memberships.include?(community)
+    assert_not_includes profile.memberships, community
   end
  
 end
@@ -461,8 +461,10 @@ class ProfileTest &lt; Test::Unit::TestCase
     p = create_user('myothertestuser').person
  
     c.add_member(p)
+    assert_includes c.members, p
     c.remove_member(p)
-    assert !c.members.include?(p)
+    c.reload
+    assert_not_includes c.members, p
   end
  
   private
@@ -21,7 +21,7 @@ class ActiveRecord::Base
  
     def disaffiliate(accessor, roles)
       roles = [roles] unless roles.kind_of?(Array)
-      roles.map {|role| accessor.remove_role(role, self)}.any? 
+      role_assignments.map{|ra|ra.destroy if roles.include?(ra.role) && ra.accessor == accessor} 
     end
  
     def members
...	...	@@ -122,6 +122,7 @@ class MembershipsControllerTest < Test::Unit::TestCase
122	122
123	123	should 'present confirmation before leaving a profile' do
124	124	community = Community.create!(:name => 'my test community')
	125	+ community.add_member(profile)
125	126	get :leave, :profile => profile.identifier, :id => community.id
126	127
127	128	assert_response :success
...	...	@@ -130,13 +131,15 @@ class MembershipsControllerTest < Test::Unit::TestCase
130	131
131	132	should 'actually leave profile' do
132	133	community = Community.create!(:name => 'my test community')
	134	+ community.add_member(profile)
	135	+ assert_includes profile.memberships, community
133	136	post :leave, :profile => profile.identifier, :id => community.id, :confirmation => '1'
134	137
135	138	assert_response :redirect
136	139	assert_redirected_to :action => 'index'
137	140
138	141	profile.reload
139		- assert !profile.memberships.include?(community)
	142	+ assert_not_includes profile.memberships, community
140	143	end
141	144
142	145	end
...	...
...	...	@@ -461,8 +461,10 @@ class ProfileTest < Test::Unit::TestCase
461	461	p = create_user('myothertestuser').person
462	462
463	463	c.add_member(p)
	464	+ assert_includes c.members, p
464	465	c.remove_member(p)
465		- assert !c.members.include?(p)
	466	+ c.reload
	467	+ assert_not_includes c.members, p
466	468	end
467	469
468	470	private
...	...
...	...	@@ -21,7 +21,7 @@ class ActiveRecord::Base
21	21
22	22	def disaffiliate(accessor, roles)
23	23	roles = [roles] unless roles.kind_of?(Array)
24		- roles.map {\|role\| accessor.remove_role(role, self)}.any?
	24	+ role_assignments.map{\|ra\|ra.destroy if roles.include?(ra.role) && ra.accessor == accessor}
25	25	end
26	26
27	27	def members
...	...