diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-12-21 17:00:26 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-12-21 17:00:26 +0000 |
commit | 0817c21067429842ec15f1e2f3088bc13b6bf57c (patch) | |
tree | ec25f4089d9dcec0e5de4c053ab3383bc58817f5 /spec/features/merge_request | |
parent | a9049532a271117983430d2d80b8ad61879ecf7a (diff) | |
download | gitlab-ce-0817c21067429842ec15f1e2f3088bc13b6bf57c.tar.gz |
Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
This reverts merge request !23622
Diffstat (limited to 'spec/features/merge_request')
-rw-r--r-- | spec/features/merge_request/user_sees_discussions_spec.rb | 8 |
1 files changed, 0 insertions, 8 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 |