Adds cacheless render to Banzai object render

3 files changed, 101 insertions, 44 deletions

diff --git a/spec/lib/banzai/commit_renderer_spec.rb b/spec/lib/banzai/commit_renderer_spec.rb
new file mode 100644
index 00000000000..049d025a5b9
--- /dev/null
+++ b/spec/lib/banzai/commit_renderer_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Banzai::CommitRenderer do
+  describe '.render' do
+    it 'renders a commit description and title' do
+      user = double(:user)
+      project = create(:project, :repository)
+
+      expect(Banzai::ObjectRenderer).to receive(:new).with(project, user).and_call_original
+
+      described_class::ATTRIBUTES.each do |attr|
+        expect_any_instance_of(Banzai::ObjectRenderer).to receive(:render).with([project.commit], attr).once.and_call_original
+        expect(Banzai::Renderer).to receive(:cacheless_render_field).with(project.commit, attr)
+      end
+
+      described_class.render([project.commit], project, user)
+    end
+  end
+end
diff --git a/spec/lib/banzai/object_renderer_spec.rb b/spec/lib/banzai/object_renderer_spec.rb
index 7f5d481c36c..b172a1b718c 100644
--- a/spec/lib/banzai/object_renderer_spec.rb
+++ b/spec/lib/banzai/object_renderer_spec.rb
@@ -1,53 +1,77 @@
 require 'spec_helper'
 
 describe Banzai::ObjectRenderer do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
   let(:renderer) { described_class.new(project, user, custom_value: 'value') }
   let(:object) { Note.new(note: 'hello', note_html: '<p dir="auto">hello</p>', cached_markdown_version: CacheMarkdownField::CACHE_VERSION) }
 
   describe '#render' do
-    it 'renders and redacts an Array of objects' do
-      renderer.render([object], :note)
+    context 'with cache' do
+      it 'renders and redacts an Array of objects' do
+        renderer.render([object], :note)
 
-      expect(object.redacted_note_html).to eq '<p dir="auto">hello</p>'
-      expect(object.user_visible_reference_count).to eq 0
-    end
+        expect(object.redacted_note_html).to eq '<p dir="auto">hello</p>'
+        expect(object.user_visible_reference_count).to eq 0
+      end
 
-    it 'calls Banzai::Redactor to perform redaction' do
-      expect_any_instance_of(Banzai::Redactor).to receive(:redact).and_call_original
+      it 'calls Banzai::Redactor to perform redaction' do
+        expect_any_instance_of(Banzai::Redactor).to receive(:redact).and_call_original
 
-      renderer.render([object], :note)
-    end
+        renderer.render([object], :note)
+      end
 
-    it 'retrieves field content using Banzai.render_field' do
-      expect(Banzai).to receive(:render_field).with(object, :note).and_call_original
+      it 'retrieves field content using Banzai::Renderer.render_field' do
+        expect(Banzai::Renderer).to receive(:render_field).with(object, :note).and_call_original
 
-      renderer.render([object], :note)
-    end
+        renderer.render([object], :note)
+      end
 
-    it 'passes context to PostProcessPipeline' do
-      another_user = create(:user)
-      another_project = create(:project)
-      object = Note.new(
-        note: 'hello',
-        note_html: 'hello',
-        author: another_user,
-        project: another_project
-      )
-
-      expect(Banzai::Pipeline::PostProcessPipeline).to receive(:to_document).with(
-        anything,
-        hash_including(
-          skip_redaction: true,
-          current_user: user,
-          project: another_project,
+      it 'passes context to PostProcessPipeline' do
+        another_user = create(:user)
+        another_project = create(:project)
+        object = Note.new(
+          note: 'hello',
+          note_html: 'hello',
           author: another_user,
-          custom_value: 'value'
+          project: another_project
         )
-      ).and_call_original
 
-      renderer.render([object], :note)
+        expect(Banzai::Pipeline::PostProcessPipeline).to receive(:to_document).with(
+          anything,
+          hash_including(
+            skip_redaction: true,
+            current_user: user,
+            project: another_project,
+            author: another_user,
+            custom_value: 'value'
+          )
+        ).and_call_original
+
+        renderer.render([object], :note)
+      end
+    end
+
+    context 'without cache' do
+      let(:commit) { project.commit }
+
+      it 'renders and redacts an Array of objects' do
+        renderer.render([commit], :title)
+
+        expect(commit.redacted_title_html).to eq("Merge branch 'branch-merged' into 'master'")
+      end
+
+      it 'calls Banzai::Redactor to perform redaction' do
+        expect_any_instance_of(Banzai::Redactor).to receive(:redact).and_call_original
+
+        renderer.render([commit], :title)
+      end
+
+      it 'retrieves field content using Banzai::Renderer.cacheless_render_field' do
+        expect(Banzai::Renderer).to receive(:cacheless_render_field).with(commit, :title).and_call_original
+
+        renderer.render([commit], :title)
+      end
     end
   end
 end
diff --git a/spec/lib/banzai/renderer_spec.rb b/spec/lib/banzai/renderer_spec.rb
index 0e094405e33..da42272bbef 100644
--- a/spec/lib/banzai/renderer_spec.rb
+++ b/spec/lib/banzai/renderer_spec.rb
@@ -4,6 +4,7 @@ describe Banzai::Renderer do
   def fake_object(fresh:)
     object = double('object')
 
+    allow(object).to receive(:respond_to?).with(:cached_markdown_fields).and_return(true)
     allow(object).to receive(:cached_html_up_to_date?).with(:field).and_return(fresh)
     allow(object).to receive(:cached_html_for).with(:field).and_return('field_html')
 
@@ -12,25 +13,38 @@ describe Banzai::Renderer do
 
   describe '#render_field' do
     let(:renderer) { described_class }
-    subject { renderer.render_field(object, :field) }
 
-    context 'with a stale cache' do
-      let(:object) { fake_object(fresh: false) }
+    context 'without cache' do
+      let(:commit) { create(:project, :repository).commit }
 
-      it 'caches and returns the result' do
-        expect(object).to receive(:refresh_markdown_cache!).with(do_update: true)
+      it 'returns cacheless render field' do
+        expect(renderer).to receive(:cacheless_render_field).with(commit, :title)
 
-        is_expected.to eq('field_html')
+        renderer.render_field(commit, :title)
       end
     end
 
-    context 'with an up-to-date cache' do
-      let(:object) { fake_object(fresh: true) }
+    context 'with cache' do
+      subject { renderer.render_field(object, :field) }
 
-      it 'uses the cache' do
-        expect(object).to receive(:refresh_markdown_cache!).never
+      context 'with a stale cache' do
+        let(:object) { fake_object(fresh: false) }
 
-        is_expected.to eq('field_html')
+        it 'caches and returns the result' do
+          expect(object).to receive(:refresh_markdown_cache!).with(do_update: true)
+
+          is_expected.to eq('field_html')
+        end
+      end
+
+      context 'with an up-to-date cache' do
+        let(:object) { fake_object(fresh: true) }
+
+        it 'uses the cache' do
+          expect(object).to receive(:refresh_markdown_cache!).never
+
+          is_expected.to eq('field_html')
+        end
       end
     end
   end