summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_sees_discussions_spec.rb
diff options
context:
space:
mode:
authorConstance Okoghenun <constanceokoghenun@gmail.com>2019-01-17 12:15:33 +0100
committerConstance Okoghenun <constanceokoghenun@gmail.com>2019-01-17 12:15:33 +0100
commitc1c0c0c21b075ee9ee2eddb75ad9681f29765bb2 (patch)
tree81b8fac501896868be78ecefb1cda93188a3d24d /spec/features/merge_request/user_sees_discussions_spec.rb
parenteec16ee28c7b377101ab3d5f81835cd8c2020981 (diff)
downloadgitlab-ce-c1c0c0c21b075ee9ee2eddb75ad9681f29765bb2.tar.gz
Display "commented" only for commit discussions on merge requests
Add commit prop to NoteableNote component and pass it from NoteableDiscussion
Diffstat (limited to 'spec/features/merge_request/user_sees_discussions_spec.rb')
-rw-r--r--spec/features/merge_request/user_sees_discussions_spec.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_sees_discussions_spec.rb b/spec/features/merge_request/user_sees_discussions_spec.rb
index 4ab9a87ad4b..409dd41405b 100644
--- a/spec/features/merge_request/user_sees_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_spec.rb
@@ -88,5 +88,15 @@ describe 'Merge request > User sees discussions', :js do
expect(page).to have_content "started a discussion on commit #{note.commit_id[0...7]}"
end
end
+
+ context 'a commit non-diff discussion' do
+ let(:note) { create(:discussion_note_on_commit, project: project) }
+
+ it 'displays correct header' do
+ page.within(find("#note_#{note.id}", match: :first)) do
+ expect(page).to have_content "commented on commit #{note.commit_id[0...7]}"
+ end
+ end
+ end
end
end