diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-12-21 20:00:26 +0300 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-12-21 20:00:26 +0300 |
commit | 0817c21067429842ec15f1e2f3088bc13b6bf57c (patch) | |
tree | ec25f4089d9dcec0e5de4c053ab3383bc58817f5 /spec | |
parent | a9049532a271117983430d2d80b8ad61879ecf7a (diff) |
Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
This reverts merge request !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, 2 insertions, 10 deletions
diff --git a/spec/features/merge_request/user_sees_discussions_spec.rb b/spec/features/merge_request/user_sees_discussions_spec.rb index d130ea05654..4ab9a87ad4b 100644 --- a/spec/features/merge_request/user_sees_discussions_spec.rb +++ b/spec/features/merge_request/user_sees_discussions_spec.rb @@ -88,13 +88,5 @@ 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 0715f34dafe..21461e46cf4 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 with the note anchor' do - expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit, anchor: "note_#{discussion.first_note.id}")) + it 'returns the commit path' do + expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit)) end end end |