Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-01-17 18:56:10 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-01-17 18:56:10 +0300
commite324ccc20c52d492dd660097a4c72615c5621917 (patch)
treed3449ff9db8372a2e507e22c1924cd693e75c23f /spec/features
parentcfdae8f103568d843afb3c714444c912510a5f1f (diff)
parentca0cf5a3cd2829db4cfac007c36d5588ed369f87 (diff)
Merge branch 'issue_25017' into 'master'
Show 'too many changes' message for merge request Closes #25017 See merge request !8444
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_requests/diffs_spec.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb
index c9a0059645d..4a6c76a5caf 100644
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -22,4 +22,18 @@ feature 'Diffs URL', js: true, feature: true do
expect(page).to have_css('.diffs.tab-pane.active')
end
end
+
+ context 'when merge request has overflow' do
+ it 'displays warning' do
+ allow_any_instance_of(MergeRequestDiff).to receive(:overflow?).and_return(true)
+ allow(Commit).to receive(:max_diff_options).and_return(max_files: 20, max_lines: 20)
+
+ visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+
+ page.within('.alert') do
+ expect(page).to have_text("Too many changes to show. Plain diff Email patch To preserve
+ performance only 3 of 3+ files are displayed.")
+ end
+ end
+ end
end