diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-01 17:20:06 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-06 11:45:04 -0600 |
| commit | 117ccb8926093ab97ea47e3216370112b2aafce1 (patch) | |
| tree | 235ad2fbfa67d369b25c576779cd27ac5fe611be | |
| parent | 5e8138aa54492dd3ace42d889ba01f82e8e19c83 (diff) | |
| download | gitlab-ce-jivl-fix-delete-milestone-button-showing-up.tar.gz | |
Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-up
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 20 | ||||
| -rw-r--r-- | spec/features/milestone_spec.rb | 11 |
2 files changed, 21 insertions, 10 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index da01fc02d07..093f28e062c 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -56,13 +56,13 @@ = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close btn-grouped" - %button.js-delete-milestone-button.btn.btn-xs.btn-grouped.btn-danger{ data: { toggle: 'modal', - target: '#delete-milestone-modal', - milestone_id: milestone.id, - milestone_title: markdown_field(milestone, :title), - milestone_url: project_milestone_path(milestone.project, milestone), - milestone_issue_count: milestone.issues.count, - milestone_merge_request_count: milestone.merge_requests.count }, - disabled: true } - = _('Delete') - = icon('spin spinner', class: 'js-loading-icon hidden' ) + %button.js-delete-milestone-button.btn.btn-xs.btn-grouped.btn-danger{ data: { toggle: 'modal', + target: '#delete-milestone-modal', + milestone_id: milestone.id, + milestone_title: markdown_field(milestone, :title), + milestone_url: project_milestone_path(milestone.project, milestone), + milestone_issue_count: milestone.issues.count, + milestone_merge_request_count: milestone.merge_requests.count }, + disabled: true } + = _('Delete') + = icon('spin spinner', class: 'js-loading-icon hidden' ) diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb index cc12a1005ba..19152bf1f0f 100644 --- a/spec/features/milestone_spec.rb +++ b/spec/features/milestone_spec.rb @@ -97,4 +97,15 @@ feature 'Milestone' do end end end + + feature 'Deleting a milestone' do + scenario "The delete milestone button does not show for unauthorized users" do + create(:milestone, project: project, title: 8.7) + sign_out(user) + + visit group_milestones_path(group) + + expect(page).to have_selector('.js-delete-milestone-button', count: 0) + end + end end |