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:
Diffstat (limited to 'spec/models/merge_request_diff_file_spec.rb')
-rw-r--r--spec/models/merge_request_diff_file_spec.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/spec/models/merge_request_diff_file_spec.rb b/spec/models/merge_request_diff_file_spec.rb
index 25971f63338..5a48438adab 100644
--- a/spec/models/merge_request_diff_file_spec.rb
+++ b/spec/models/merge_request_diff_file_spec.rb
@@ -4,7 +4,12 @@ require 'spec_helper'
RSpec.describe MergeRequestDiffFile do
it_behaves_like 'a BulkInsertSafe model', MergeRequestDiffFile do
- let(:valid_items_for_bulk_insertion) { build_list(:merge_request_diff_file, 10) }
+ let(:valid_items_for_bulk_insertion) do
+ build_list(:merge_request_diff_file, 10) do |mr_diff_file|
+ mr_diff_file.merge_request_diff = create(:merge_request_diff)
+ end
+ end
+
let(:invalid_items_for_bulk_insertion) { [] } # class does not have any validations defined
end
@@ -25,6 +30,14 @@ RSpec.describe MergeRequestDiffFile do
it 'unpacks from base 64' do
expect(subject.diff).to eq(unpacked)
end
+
+ context 'invalid base64' do
+ let(:packed) { '---/dev/null' }
+
+ it 'returns the raw diff' do
+ expect(subject.diff).to eq(packed)
+ end
+ end
end
context 'when the diff is not marked as binary' do