diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-23 18:45:33 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-23 18:45:33 +0000 |
commit | 1f3225a5e375b370e76c98e47e8ed0b8bc67eac8 (patch) | |
tree | 0bf5d08123c48c0245713f5515e49798caaf56d6 | |
parent | 788f54152be78fc1e7af01b92f83e6db00736fad (diff) | |
parent | 466adeeb56ccfa94877e8010ad127be2b244a0a6 (diff) | |
download | gitlab-ce-1f3225a5e375b370e76c98e47e8ed0b8bc67eac8.tar.gz |
Merge branch 'mk-fix-breadcrumb-order-33938' into 'master'
Fix breadcrumb order
Closes #33938
See merge request !12322
-rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml | 4 | ||||
-rw-r--r-- | spec/helpers/groups_helper_spec.rb | 13 |
3 files changed, 18 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/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml b/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml new file mode 100644 index 00000000000..790af692b92 --- /dev/null +++ b/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml @@ -0,0 +1,4 @@ +--- +title: Fix reversed breadcrumb order for nested groups +merge_request: 12322 +author: 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 |