summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-14 17:12:22 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-16 09:14:21 +0100
commit2ef19a24a6dcba2bc3b3d5d66658d27b4ef10e43 (patch)
tree74397ba34be74517d91a17454c8c50e730fa93b6
parent20dcf5f83f9ac2583a2d2607fb8c8761906ec268 (diff)
downloadgitlab-ce-2ef19a24a6dcba2bc3b3d5d66658d27b4ef10e43.tar.gz
Add view spec for more_actions_dropdown render branches
-rw-r--r--app/views/projects/notes/_more_actions_dropdown.html.haml35
-rw-r--r--spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb70
2 files changed, 87 insertions, 18 deletions
diff --git a/app/views/projects/notes/_more_actions_dropdown.html.haml b/app/views/projects/notes/_more_actions_dropdown.html.haml
index a14e4a61d56..75a4687e1e3 100644
--- a/app/views/projects/notes/_more_actions_dropdown.html.haml
+++ b/app/views/projects/notes/_more_actions_dropdown.html.haml
@@ -1,20 +1,19 @@
- is_current_user = current_user == note.author
-- return unless note_editable || !is_current_user
-
-.dropdown.more-actions
- = button_tag title: 'More actions', class: 'note-action-button more-actions-toggle has-tooltip btn btn-transparent', data: { toggle: 'dropdown', container: 'body' } do
- = icon('ellipsis-v', class: 'icon')
- %ul.dropdown-menu.more-actions-dropdown.dropdown-open-left
- - if note_editable
- %li
- = button_tag 'Edit comment', class: 'js-note-edit btn btn-transparent'
- %li.divider
- - unless is_current_user
- %li
- = link_to new_abuse_report_path(user_id: note.author.id, ref_url: noteable_note_url(note)) do
- Report as abuse
- - if note_editable
- %li
- = link_to note_url(note), method: :delete, data: { confirm: 'Are you sure you want to delete this comment?' }, remote: true, class: 'js-note-delete' do
- %span.text-danger Delete comment
+- if note_editable || !is_current_user
+ .dropdown.more-actions
+ = button_tag title: 'More actions', class: 'note-action-button more-actions-toggle has-tooltip btn btn-transparent', data: { toggle: 'dropdown', container: 'body' } do
+ = icon('ellipsis-v', class: 'icon')
+ %ul.dropdown-menu.more-actions-dropdown.dropdown-open-left
+ - if note_editable
+ %li
+ = button_tag 'Edit comment', class: 'js-note-edit btn btn-transparent'
+ %li.divider
+ - unless is_current_user
+ %li
+ = link_to new_abuse_report_path(user_id: note.author.id, ref_url: noteable_note_url(note)) do
+ Report as abuse
+ - if note_editable
+ %li
+ = link_to note_url(note), method: :delete, data: { confirm: 'Are you sure you want to delete this comment?' }, remote: true, class: 'js-note-delete' do
+ %span.text-danger Delete comment
diff --git a/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb b/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb
new file mode 100644
index 00000000000..7a17cf58231
--- /dev/null
+++ b/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb
@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe 'projects/notes/_more_actions_dropdown', :view do
+ let(:author_user) { create(:user) }
+ let(:not_author_user) { create(:user) }
+
+ let(:project) { create(:empty_project) }
+ let(:issue) { create(:issue, project: project) }
+ let!(:note) { create(:note_on_issue, author: author_user, noteable: issue, project: project) }
+
+ before do
+ allow(view).to receive(:note).and_return(note)
+ assign(:project, project)
+ end
+
+ context 'not editable and not current users comment' do
+ before do
+ allow(view).to receive(:note_editable).and_return(false)
+ allow(view).to receive(:current_user).and_return(not_author_user)
+
+ render
+ end
+
+ it 'shows Report as abuse button' do
+ expect(rendered).to have_link('Report as abuse')
+ end
+ end
+
+ context 'not editable and current users comment' do
+ before do
+ allow(view).to receive(:note_editable).and_return(false)
+ allow(view).to receive(:current_user).and_return(author_user)
+
+ render
+ end
+
+ it 'does not show the More actions button' do
+ expect(rendered).not_to have_selector('.dropdown.more-actions')
+ end
+ end
+
+ context 'editable and not current users comment' do
+ before do
+ allow(view).to receive(:note_editable).and_return(true)
+ allow(view).to receive(:current_user).and_return(not_author_user)
+
+ render
+ end
+
+ it 'shows Report as abuse, Edit and Delete buttons' do
+ expect(rendered).to have_link('Report as abuse')
+ expect(rendered).to have_button('Edit comment')
+ expect(rendered).to have_link('Delete comment')
+ end
+ end
+
+ context 'editable and current users comment' do
+ before do
+ allow(view).to receive(:note_editable).and_return(true)
+ allow(view).to receive(:current_user).and_return(author_user)
+
+ render
+ end
+
+ it 'shows Edit and Delete buttons' do
+ expect(rendered).to have_button('Edit comment')
+ expect(rendered).to have_link('Delete comment')
+ end
+ end
+end