diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-12-21 00:10:50 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-12-21 00:10:50 +0300 |
commit | 62d250ff666770f9807eec2199a7b208ea8b518a (patch) | |
tree | 15034db1e7b8b9d8896ff58409280c82aaac62c8 /spec | |
parent | a39008fed3d16b081c8a694f6ea4d2a556075a71 (diff) | |
parent | 795b4a307f5e03714e022978a0a0f14a47a23eb4 (diff) |
Merge branch 'winh-discussion-header-commented' into 'master'
Display "commented" only for commit discussions on merge requests
Closes #53950 and #53681
See merge request gitlab-org/gitlab-ce!23622
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_request/user_sees_discussions_spec.rb | 8 | ||||
-rw-r--r-- | spec/helpers/notes_helper_spec.rb | 4 |
2 files changed, 10 insertions, 2 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 diff --git a/spec/helpers/notes_helper_spec.rb b/spec/helpers/notes_helper_spec.rb index 21461e46cf4..0715f34dafe 100644 --- a/spec/helpers/notes_helper_spec.rb +++ b/spec/helpers/notes_helper_spec.rb @@ -185,8 +185,8 @@ describe NotesHelper do context 'for a non-diff discussion' do let(:discussion) { create(:discussion_note_on_commit, project: project).to_discussion } - it 'returns the commit path' do - expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit)) + it 'returns the commit path with the note anchor' do + expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit, anchor: "note_#{discussion.first_note.id}")) end end end |