summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_comments_on_diff_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 00:06:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 00:06:26 +0000
commit991a295378736c60d419c794f0accbf0336987fc (patch)
treeaaee5152256c8d4eb40a1583521bcf320082bb49 /spec/features/merge_request/user_comments_on_diff_spec.rb
parent71d998ca0de672d5accdf209b4b5e3f360ea5267 (diff)
downloadgitlab-ce-991a295378736c60d419c794f0accbf0336987fc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request/user_comments_on_diff_spec.rb')
-rw-r--r--spec/features/merge_request/user_comments_on_diff_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_comments_on_diff_spec.rb b/spec/features/merge_request/user_comments_on_diff_spec.rb
index 19b8a7f74b7..6a23b6cdf60 100644
--- a/spec/features/merge_request/user_comments_on_diff_spec.rb
+++ b/spec/features/merge_request/user_comments_on_diff_spec.rb
@@ -13,12 +13,15 @@ describe 'User comments on a diff', :js do
let(:user) { create(:user) }
before do
+ stub_feature_flags(single_mr_diff_view: false)
project.add_maintainer(user)
sign_in(user)
visit(diffs_project_merge_request_path(project, merge_request))
end
+ it_behaves_like 'rendering a single diff version'
+
context 'when viewing comments' do
context 'when toggling inline comments' do
context 'in a single file' do