Fix several_namespaces? to work with multiple ownership of groups

Stephen Holdaway
1 parent c7cb7599
Showing 2 changed files with 14 additions and 1 deletions Show diff stats
app/models/user.rb
spec/models/user_spec.rb
@@ -322,7 +322,7 @@ class User &lt; ActiveRecord::Base
   end
   def several_namespaces?
-    namespaces.many?
+    namespaces.many? || owned_groups.any?
   end
   def namespace_id
@@ -139,6 +139,19 @@ describe User do
     it { @user.owned_groups.should == [@group] }
   end
+  describe 'group multiple owners' do
+    before do
+      ActiveRecord::Base.observers.enable(:user_observer)
+      @user = create :user
+      @user2 = create :user
+      @group = create :group, owner: @user
+
+      @group.add_users([@user2.id], UsersGroup::OWNER)
+    end
+
+    it { @user2.several_namespaces?.should be_true }
+  end
+
   describe 'namespaced' do
     before do
       ActiveRecord::Base.observers.enable(:user_observer)
	@@ -322,7 +322,7 @@ class User < ActiveRecord::Base		@@ -322,7 +322,7 @@ class User < ActiveRecord::Base
322	end	322	end
323		323
324	def several_namespaces?	324	def several_namespaces?
325	- namespaces.many?	325	+ namespaces.many? \|\| owned_groups.any?
326	end	326	end
327		327
328	def namespace_id	328	def namespace_id
	@@ -139,6 +139,19 @@ describe User do		@@ -139,6 +139,19 @@ describe User do
139	it { @user.owned_groups.should == [@group] }	139	it { @user.owned_groups.should == [@group] }
140	end	140	end
141		141
		142	+ describe 'group multiple owners' do
		143	+ before do
		144	+ ActiveRecord::Base.observers.enable(:user_observer)
		145	+ @user = create :user
		146	+ @user2 = create :user
		147	+ @group = create :group, owner: @user
		148	+
		149	+ @group.add_users([@user2.id], UsersGroup::OWNER)
		150	+ end
		151	+
		152	+ it { @user2.several_namespaces?.should be_true }
		153	+ end
		154	+
142	describe 'namespaced' do	155	describe 'namespaced' do
143	before do	156	before do
144	ActiveRecord::Base.observers.enable(:user_observer)	157	ActiveRecord::Base.observers.enable(:user_observer)