diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-11-23 19:18:34 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-11-25 15:25:01 +0200 |
| commit | 847ada36c48107442f69338eda4c0b601ab98b48 (patch) | |
| tree | 7134315c7af7cde1c842a8f8bbec097ee8f3696f /spec/services | |
| parent | 4646d453b3211e29ec5afba2568766018caf32e0 (diff) | |
| download | gitlab-ce-timeout-merge-request-for-binary-file.tar.gz | |
Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-file
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/merge_requests/merge_request_diff_cache_service_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb index 807f89e80b7..05cdbe5287a 100644 --- a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb +++ b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb @@ -10,6 +10,7 @@ describe MergeRequests::MergeRequestDiffCacheService do expect(Rails.cache).to receive(:read).with(cache_key).and_return({}) expect(Rails.cache).to receive(:write).with(cache_key, anything) + allow_any_instance_of(Gitlab::Diff::File).to receive(:blob).and_return(double("text?" => true)) subject.execute(merge_request) end |