diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-09-07 15:42:01 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-07 15:42:01 +0000 |
| commit | b027b3e037a328cc8a699d6befa796039c03b44b (patch) | |
| tree | 65cd8b73fa9e8e94595e73acc10f81f1880e0c29 /spec/services | |
| parent | 99f1a222dc8bd17f3becf75b172ab645368a4566 (diff) | |
| parent | cd1d5b244072c6701e77c6bd7be9e9a0d60f8967 (diff) | |
| download | gitlab-ce-b027b3e037a328cc8a699d6befa796039c03b44b.tar.gz | |
Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into 'master'
Write diff highlighting cache upon MR creation (refactors caching)
Closes #50204
See merge request gitlab-org/gitlab-ce!21489
Diffstat (limited to 'spec/services')
| -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 |