diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-07-03 09:11:23 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-07-03 09:11:23 +0000 |
commit | 7e84f353b9c7ef79829923bd5888af5acf0aa8b6 (patch) | |
tree | 105319188ac17578a46d6731e73fc075093f7898 /spec | |
parent | 122e764f9b9d0deb331d21284172c2e7bef34431 (diff) | |
parent | 2c2422d54e4b12471dbc25dbc90cbbffe4fb1c2b (diff) | |
download | gitlab-ce-7e84f353b9c7ef79829923bd5888af5acf0aa8b6.tar.gz |
Merge branch 'fix-gitaly-mr-creation-limits' into 'master'
Fix MR diffs created with gitaly_diff_between enabled
Closes gitaly#1256
See merge request gitlab-org/gitlab-ce!20300
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/gitaly_client/commit_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/merge_request_diff_spec.rb | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb index 7951cbe7b1d..54f2ea33f90 100644 --- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb @@ -17,7 +17,7 @@ describe Gitlab::GitalyClient::CommitService do repository: repository_message, left_commit_id: 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660', right_commit_id: commit.id, - collapse_diffs: true, + collapse_diffs: false, enforce_limits: true, **Gitlab::Git::DiffCollection.collection_limits.to_h ) @@ -35,7 +35,7 @@ describe Gitlab::GitalyClient::CommitService do repository: repository_message, left_commit_id: Gitlab::Git::EMPTY_TREE_ID, right_commit_id: initial_commit.id, - collapse_diffs: true, + collapse_diffs: false, enforce_limits: true, **Gitlab::Git::DiffCollection.collection_limits.to_h ) diff --git a/spec/models/merge_request_diff_spec.rb b/spec/models/merge_request_diff_spec.rb index 48c01fc4d4e..ccc3ff861c5 100644 --- a/spec/models/merge_request_diff_spec.rb +++ b/spec/models/merge_request_diff_spec.rb @@ -153,6 +153,13 @@ describe MergeRequestDiff do expect(mr_diff.empty?).to be_truthy end + it 'expands collapsed diffs before saving' do + mr_diff = create(:merge_request, source_branch: 'expand-collapse-lines', target_branch: 'master').merge_request_diff + diff_file = mr_diff.merge_request_diff_files.find_by(new_path: 'expand-collapse/file-5.txt') + + expect(diff_file.diff).not_to be_empty + end + it 'saves binary diffs correctly' do path = 'files/images/icn-time-tracking.pdf' mr_diff = create(:merge_request, source_branch: 'add-pdf-text-binary', target_branch: 'master').merge_request_diff |