kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Refactor Namespace#parents method

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2016-12-13 20:49:25 +02:00
parent f8a17a3835
commit 82f9957d46
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/namespace.rb
View file

@ -172,17 +172,7 @@ class Namespace < ActiveRecord::Base
end
def parents
@parents ||=
begin
parents = []
if parent
parents << parent
parents += parent.parents
end
parents
end
@parents ||= parent ? parent.parents + [parent] : []
end
private

8
spec/models/namespace_spec.rb
View file

@ -145,7 +145,13 @@ describe Namespace, models: true do
let(:group) { create(:group) }
let(:nested_group) { create(:group, parent: group) }
let(:deep_nested_group) { create(:group, parent: nested_group) }
let(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
it { expect(deep_nested_group.parents).to eq([nested_group, group]) }
it 'returns the correct parents' do
expect(very_deep_nested_group.parents).to eq([group, nested_group, deep_nested_group])
expect(deep_nested_group.parents).to eq([group, nested_group])
expect(nested_group.parents).to eq([group])
expect(group.parents).to eq([])
end
end
end