Merge branch '19766-dont-crash-when-no-objects-to-cache' into 'master'

ObjectRenderer doesn't crash when no objects to cache with Rails.cache.read_multi ## What does this MR do? Avoid calls to Rails.cache.read_multi without cache keys so it doesn't raise an exception ## What are the relevant issue numbers? Closes #19766 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added. I considered is not needed is a fix over a RC - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5229

Merge branch '19766-dont-crash-when-no-objects-to-cache' into 'master'
fb229bbf · Rémy Coutable · ecd301dd · cc752f24 · fb229bbf · fb229bbf
Commit fb229bbf authored Jul 13, 2016 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 0 deletions

renderer.rb lib/banzai/renderer.rb +6 -0

object_renderer_spec.rb spec/lib/banzai/object_renderer_spec.rb +11 -0

No files found.
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
@@ -61,11 +61,17 @@ module Banzai
      end

      cacheable_items, non_cacheable_items = items_collection.partition { |item| item.key?(:cache_key) }
+
+      items_in_cache = []
+      items_not_in_cache = []
+
+      unless cacheable_items.empty?
        items_in_cache = Rails.cache.read_multi(*cacheable_items.map { |item| item[:cache_key] })
        items_not_in_cache = cacheable_items.reject do |item|
          item[:rendered] = items_in_cache[item[:cache_key]]
          items_in_cache.key?(item[:cache_key])
        end
+      end

      (items_not_in_cache + non_cacheable_items).each do |item|
        item[:rendered] = render(item[:text], item[:context])

--- a/spec/lib/banzai/object_renderer_spec.rb
+++ b/spec/lib/banzai/object_renderer_spec.rb
@@ -109,6 +109,17 @@ describe Banzai::ObjectRenderer do
      expect(docs[1]).to be_an_instance_of(Nokogiri::HTML::DocumentFragment)
      expect(docs[1].to_html).to eq('<p>bye</p>')
    end
+
+    it 'returns when no objects to render' do
+      objects = []
+      renderer = described_class.new(project, user, pipeline: :note)
+
+      expect(Banzai).to receive(:cache_collection_render).
+        with([]).
+        and_call_original
+
+      expect(renderer.render_attributes(objects, :note)).to eq([])
+    end
  end

  describe '#base_context' do