diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 21:08:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 21:08:00 +0000 |
commit | 69d6d3ca2013e97cfd2d89449669ea7bf475f4e9 (patch) | |
tree | 2cc4227ebfc52b7603691f06b0b8e09e030e8428 /spec/serializers | |
parent | 01fdcf49b1553c22ae116fe96cedd7b91d02225c (diff) | |
download | gitlab-ce-69d6d3ca2013e97cfd2d89449669ea7bf475f4e9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/diffs_metadata_entity_spec.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/spec/serializers/diffs_metadata_entity_spec.rb b/spec/serializers/diffs_metadata_entity_spec.rb index aaca393ec27..0fa643d37b3 100644 --- a/spec/serializers/diffs_metadata_entity_spec.rb +++ b/spec/serializers/diffs_metadata_entity_spec.rb @@ -36,8 +36,16 @@ describe DiffsMetadataEntity do describe 'diff_files' do it 'returns diff files metadata' do - payload = - DiffFileMetadataEntity.represent(merge_request_diff.diffs.diff_files).as_json + raw_diff_files = merge_request_diff.diffs.raw_diff_files + + expect_next_instance_of(Gitlab::Diff::FileCollection::MergeRequestDiff) do |instance| + # Use lightweight version instead. Several methods delegate to it, so putting a 5 + # calls limit. + expect(instance).to receive(:raw_diff_files).at_most(5).times.and_call_original + expect(instance).not_to receive(:diff_files) + end + + payload = DiffFileMetadataEntity.represent(raw_diff_files).as_json expect(subject[:diff_files]).to eq(payload) end |