diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
| commit | a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375 (patch) | |
| tree | 82b1ea27fe2a9a1be884467e10d9bde688ce97d1 /spec/services/merge_requests/reload_diffs_service_spec.rb | |
| parent | bfd2181310097f5c0a92a43ffc2b7b9540b96ad3 (diff) | |
| parent | 2f990e3408d00cad473d8dcf8a4e49155cc3cc33 (diff) | |
| download | gitlab-ce-a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375.tar.gz | |
merge master and resolve conflicts
Diffstat (limited to 'spec/services/merge_requests/reload_diffs_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/reload_diffs_service_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/merge_requests/reload_diffs_service_spec.rb b/spec/services/merge_requests/reload_diffs_service_spec.rb index a0a27d247fc..21f369a3818 100644 --- a/spec/services/merge_requests/reload_diffs_service_spec.rb +++ b/spec/services/merge_requests/reload_diffs_service_spec.rb @@ -57,6 +57,7 @@ describe MergeRequests::ReloadDiffsService, :use_clean_rails_memory_store_cachin expect(Rails.cache).to receive(:delete).with(old_cache_key).and_call_original expect(Rails.cache).to receive(:read).with(new_cache_key).and_call_original expect(Rails.cache).to receive(:write).with(new_cache_key, anything, anything).and_call_original + subject.execute end end |