From e19526c2ac3e6a8ae62934c09ac70219062c818a Mon Sep 17 00:00:00 2001 From: Stephen Holdaway Date: Thu, 12 Sep 2013 00:10:45 +1200 Subject: [PATCH] Fix several_namespaces? to work with multiple ownership of groups --- app/models/user.rb | 2 +- spec/models/user_spec.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index c2355eaab99..2411b270fc6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -322,7 +322,7 @@ class User < ActiveRecord::Base end def several_namespaces? - namespaces.many? + namespaces.many? || owned_groups.any? end def namespace_id diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index de06bf71dc1..d79d2b82b6a 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -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)