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:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-07-31 18:47:22 +0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-08-01 16:26:38 +0300
commitfc4a0cd055643d6d66ed0dc8f0ba3ad5f09f6a95 (patch)
tree10edbe2ddaf174407f2867089f0cae14cac0f5fb /spec/models
parentabae261b86d8a1eedb50e85083cad1a07154c4d3 (diff)
Only serializes diff files found by paths query
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/merge_request_diff_spec.rb7
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 0aee78ac12d..90cce826b6c 100644
--- a/spec/models/merge_request_diff_spec.rb
+++ b/spec/models/merge_request_diff_spec.rb
@@ -127,6 +127,13 @@ describe MergeRequestDiff do
expect(diffs.map(&:new_path)).to contain_exactly('files/ruby/popen.rb')
end
+ it 'only serializes diff files found by query' do
+ expect(diff_with_commits.merge_request_diff_files.count).to be > 10
+ expect_any_instance_of(MergeRequestDiffFile).to receive(:to_hash).once
+
+ diffs
+ end
+
it 'uses the diffs from the DB' do
expect(diff_with_commits).to receive(:load_diffs)