diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-03 16:30:09 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-03 16:30:09 +0300 |
| commit | 1432e5605c1d77fc76aa64b5a8da87cb3266a0dc (patch) | |
| tree | 4273854cc5f0253e5970bd1ccc7ff3ac9774c4cc /spec/models/merge_request_diff_spec.rb | |
| parent | 7780cd6ab1b3dc572ac85660744a315e1cf64f8d (diff) | |
| parent | c489d53b2e2eecb22f8dc7034da142221220e89f (diff) | |
Merge branch 'master' into 11-1-stable-prepare-rc3
Diffstat (limited to 'spec/models/merge_request_diff_spec.rb')
| -rw-r--r-- | spec/models/merge_request_diff_spec.rb | 7 |
1 files changed, 7 insertions, 0 deletions
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 |