summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-12-14 14:58:18 +0100
committerWinnie Hellmann <winnie@gitlab.com>2018-12-19 23:50:43 +0100
commit0ee8b2a74bfb2e292874939188929d262a62a0bb (patch)
tree5077be04c93ea8bff63519f5fa0c8bbdcbb9c9b4 /spec/features/merge_request
parent05b16421c75716a86745dce81e70a7e0e0280abe (diff)
downloadgitlab-ce-0ee8b2a74bfb2e292874939188929d262a62a0bb.tar.gz
Add failing test for commit ID in discussion header
Diffstat (limited to 'spec/features/merge_request')
-rw-r--r--spec/features/merge_request/user_sees_discussions_spec.rb8
1 files changed, 8 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..d130ea05654 100644
--- a/spec/features/merge_request/user_sees_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_spec.rb
@@ -88,5 +88,13 @@ 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
+ expect(page).to have_content "commented on commit #{note.commit_id[0...7]}"
+ end
+ end
end
end