From 991a295378736c60d419c794f0accbf0336987fc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 11 Nov 2019 00:06:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/merge_request/user_posts_diff_notes_spec.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'spec/features/merge_request/user_posts_diff_notes_spec.rb') diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb index 8b16760606c..6328c0a5133 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -14,12 +14,15 @@ describe 'Merge request > User posts diff notes', :js do let(:test_note_comment) { 'this is a test note!' } before do + stub_feature_flags(single_mr_diff_view: false) set_cookie('sidebar_collapsed', 'true') project.add_developer(user) sign_in(user) end + it_behaves_like 'rendering a single diff version' + context 'when hovering over a parallel view diff file' do before do visit diffs_project_merge_request_path(project, merge_request, view: 'parallel') -- cgit v1.2.1