Commit 3e7e08ad authored by Douwe Maan's avatar Douwe Maan

Show group name instead of path on group page

parent 5cd1a48d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.avatar-container.s70.group-avatar .avatar-container.s70.group-avatar
= image_tag group_icon(@group), class: "avatar s70 avatar-tile" = image_tag group_icon(@group), class: "avatar s70 avatar-tile"
%h1.group-title %h1.group-title
@#{@group.path} = @group.name
%span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
= visibility_level_icon(@group.visibility_level, fw: false) = visibility_level_icon(@group.visibility_level, fw: false)
......
---
title: Show group name instead of path on group page
merge_request:
author:
...@@ -5,7 +5,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps ...@@ -5,7 +5,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
include SharedUser include SharedUser
step 'I should see group "Owned"' do step 'I should see group "Owned"' do
expect(page).to have_content '@owned' expect(page).to have_content 'Owned'
end end
step 'I am a signed out user' do step 'I am a signed out user' do
......
...@@ -18,14 +18,14 @@ feature 'Edit group settings', feature: true do ...@@ -18,14 +18,14 @@ feature 'Edit group settings', feature: true do
update_path(new_group_path) update_path(new_group_path)
visit new_group_full_path visit new_group_full_path
expect(current_path).to eq(new_group_full_path) expect(current_path).to eq(new_group_full_path)
expect(find('h1.group-title')).to have_content(new_group_path) expect(find('h1.group-title')).to have_content(group.name)
end end
scenario 'the old group path redirects to the new path' do scenario 'the old group path redirects to the new path' do
update_path(new_group_path) update_path(new_group_path)
visit old_group_full_path visit old_group_full_path
expect(current_path).to eq(new_group_full_path) expect(current_path).to eq(new_group_full_path)
expect(find('h1.group-title')).to have_content(new_group_path) expect(find('h1.group-title')).to have_content(group.name)
end end
context 'with a subgroup' do context 'with a subgroup' do
...@@ -37,14 +37,14 @@ feature 'Edit group settings', feature: true do ...@@ -37,14 +37,14 @@ feature 'Edit group settings', feature: true do
update_path(new_group_path) update_path(new_group_path)
visit new_subgroup_full_path visit new_subgroup_full_path
expect(current_path).to eq(new_subgroup_full_path) expect(current_path).to eq(new_subgroup_full_path)
expect(find('h1.group-title')).to have_content(subgroup.path) expect(find('h1.group-title')).to have_content(subgroup.name)
end end
scenario 'the old subgroup path redirects to the new path' do scenario 'the old subgroup path redirects to the new path' do
update_path(new_group_path) update_path(new_group_path)
visit old_subgroup_full_path visit old_subgroup_full_path
expect(current_path).to eq(new_subgroup_full_path) expect(current_path).to eq(new_subgroup_full_path)
expect(find('h1.group-title')).to have_content(subgroup.path) expect(find('h1.group-title')).to have_content(subgroup.name)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment