Download as
Browse Code »

Commit 1c2be6712243bc635eeb487720ab66d97d79ce9e

Authored by Stephen Holdaway
Committed by Dmitriy Zaporozhets
1 parent ea55707b

Fix several_namespaces? to work with multiple ownership of groups

Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @1c2be67
... ... @@ -319,7 +319,7 @@ class User < ActiveRecord::Base
319 319 end
320 320  
321 321 def several_namespaces?
322   - namespaces.many?
  322 + namespaces.many? || owned_groups.any?
323 323 end
324 324  
325 325 def namespace_id
... ...
spec/models/user_spec.rb
  Diff comments   View file @1c2be67
... ... @@ -139,6 +139,19 @@ describe User do
139 139 it { @user.owned_groups.should == [@group] }
140 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 155 describe 'namespaced' do
143 156 before do
144 157 ActiveRecord::Base.observers.enable(:user_observer)
... ...