diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-28 16:24:54 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-28 16:24:54 +0300 |
| commit | ee3d9b9dd5940c19f880644c0ce12f4ec7941f03 (patch) | |
| tree | c4dc155ee35de282e0806c0b87c8b585f8a47119 | |
| parent | e28896ce0d812105291eccd140f29d0d94919f9c (diff) | |
| parent | fae42270c4cb4ac4c9b637dac00a585988e3151e (diff) | |
Merge branch '48255-no-ui-element-to-edit-group-label' into 'master'
Resolve "No UI element to edit group label"
Closes #48255
See merge request gitlab-org/gitlab-ce!20192
| -rw-r--r-- | app/views/shared/_label.html.haml | 10 | ||||
| -rw-r--r-- | spec/features/groups/labels/index_spec.rb | 17 |
2 files changed, 23 insertions, 4 deletions
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 5eec7b02b54..e93925b5ef9 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -21,8 +21,9 @@ = sprite_icon('star-o') %button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: _('Remove priority'), type: 'button', data: { placement: 'top' }, aria_label: _('Deprioritize label') } = sprite_icon('star') + - if can?(current_user, :admin_label, label) %li.inline - = link_to edit_label_path(label), class: 'btn btn-transparent label-action', aria_label: 'Edit label' do + = link_to edit_label_path(label), class: 'btn btn-transparent label-action edit', aria_label: 'Edit label' do = sprite_icon('pencil') %li.inline .dropdown @@ -42,9 +43,10 @@ container: 'body', toggle: 'modal' } } = _('Promote to group label') - %li - %span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } } - %button.text-danger.remove-row{ type: 'button' }= _('Delete') + - if can?(current_user, :admin_label, label) + %li + %span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } } + %button.text-danger.remove-row{ type: 'button' }= _('Delete') - if current_user %li.inline.label-subscription - if can_subscribe_to_label_in_different_levels?(label) diff --git a/spec/features/groups/labels/index_spec.rb b/spec/features/groups/labels/index_spec.rb new file mode 100644 index 00000000000..6c1b43a9013 --- /dev/null +++ b/spec/features/groups/labels/index_spec.rb @@ -0,0 +1,17 @@ +require 'spec_helper' + +feature 'Group labels' do + let(:user) { create(:user) } + let(:group) { create(:group) } + let!(:label) { create(:group_label, group: group) } + + background do + group.add_owner(user) + sign_in(user) + visit group_labels_path(group) + end + + scenario 'label has edit button', :js do + expect(page).to have_selector('.label-action.edit') + end +end |