diff options
author | Michael Kozono <mkozono@gmail.com> | 2017-06-20 14:35:55 -0700 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-06-22 13:38:29 -0700 |
commit | daef4087127747d4bf13fc05d3c39f9a7cd72c01 (patch) | |
tree | 62d4b63c8e03ee2a8516228b0da858dc248115a8 | |
parent | bf0b3d835211077cb10ee3aec9ee6e0bca2304b6 (diff) | |
download | gitlab-ce-daef4087127747d4bf13fc05d3c39f9a7cd72c01.tar.gz |
Fix breadcrumb order
-rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
-rw-r--r-- | spec/helpers/groups_helper_spec.rb | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index c003b01e226..eb45241615f 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -15,7 +15,7 @@ module GroupsHelper @has_group_title = true full_title = '' - group.ancestors.each do |parent| + group.ancestors.reverse.each do |parent| full_title += link_to(simple_sanitize(parent.name), group_path(parent), class: 'group-path hidable') full_title += '<span class="hidable"> / </span>'.html_safe end diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb index a7c06e577a2..84a60ce13fc 100644 --- a/spec/helpers/groups_helper_spec.rb +++ b/spec/helpers/groups_helper_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe GroupsHelper do + include ApplicationHelper + describe 'group_icon' do avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif') @@ -81,4 +83,15 @@ describe GroupsHelper do end end end + + describe 'group_title' 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 'outputs the groups in the correct order' do + expect(group_title(very_deep_nested_group)).to match(/>#{group.name}<\/a>.*>#{nested_group.name}<\/a>.*>#{deep_nested_group.name}<\/a>/) + end + end end |