summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_views_diffs_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_views_diffs_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_views_diffs_spec.rb')
-rw-r--r--spec/features/merge_request/user_views_diffs_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_views_diffs_spec.rb b/spec/features/merge_request/user_views_diffs_spec.rb
index 2d1eb260236..5a29477e597 100644
--- a/spec/features/merge_request/user_views_diffs_spec.rb
+++ b/spec/features/merge_request/user_views_diffs_spec.rb
@@ -9,6 +9,7 @@ describe 'User views diffs', :js do
let(:project) { create(:project, :public, :repository) }
before do
+ stub_feature_flags(single_mr_diff_view: false)
visit(diffs_project_merge_request_path(project, merge_request))
wait_for_requests
@@ -16,6 +17,8 @@ describe 'User views diffs', :js do
find('.js-toggle-tree-list').click
end
+ it_behaves_like 'rendering a single diff version'
+
shared_examples 'unfold diffs' do
it 'unfolds diffs upwards' do
first('.js-unfold').click