diff options
| -rw-r--r-- | spec/models/merge_request_diff_spec.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/spec/models/merge_request_diff_spec.rb b/spec/models/merge_request_diff_spec.rb index 0a10ee01506..26786b187c0 100644 --- a/spec/models/merge_request_diff_spec.rb +++ b/spec/models/merge_request_diff_spec.rb @@ -85,7 +85,7 @@ describe MergeRequestDiff, models: true do it 'saves overflow state' do allow(Commit).to receive(:max_diff_options) - .and_return(max_lines: 0, max_files: 0) + .and_return(max_lines: 0, max_files: 0) mr_diff = create(:merge_request).merge_request_diff @@ -94,7 +94,7 @@ describe MergeRequestDiff, models: true do it 'saves empty state' do allow_any_instance_of(MergeRequestDiff).to receive(:commits) - .and_return([]) + .and_return([]) mr_diff = create(:merge_request).merge_request_diff @@ -139,4 +139,15 @@ describe MergeRequestDiff, models: true do expect(subject.commits_count).to eq 2 end end + + describe '#utf8_st_diffs' do + it 'does not raise error when a hash value is nil' do + subject.st_diffs = [ + { diff: "\0" }, + { diff: "\x05\x00\x68\x65\x6c\x6c\x6f"} + ] + + expect { subject.utf8_st_diffs }.not_to raise_error + end + end end |