Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master'

Treat empty markdown and html strings as valid cached text, not missing cache…

See merge request gitlab-org/gitlab-ce!15856

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/models/concerns/cache_markdown_field_spec.rb b/spec/models/concerns/cache_markdown_field_spec.rb
index 129dfa07f15..3c7f578975b 100644
--- a/spec/models/concerns/cache_markdown_field_spec.rb
+++ b/spec/models/concerns/cache_markdown_field_spec.rb
@@ -102,6 +102,26 @@ describe CacheMarkdownField do
     it { expect(thing.cached_markdown_version).to eq(CacheMarkdownField::CACHE_VERSION) }
   end
 
+  context 'when a markdown field is set repeatedly to an empty string' do
+    it do
+      expect(thing).to receive(:refresh_markdown_cache).once
+      thing.foo = ''
+      thing.save
+      thing.foo = ''
+      thing.save
+    end
+  end
+
+  context 'when a markdown field is set repeatedly to a string which renders as empty html' do
+    it do
+      expect(thing).to receive(:refresh_markdown_cache).once
+      thing.foo = '[//]: # (This is also a comment.)'
+      thing.save
+      thing.foo = '[//]: # (This is also a comment.)'
+      thing.save
+    end
+  end
+
   context 'a non-markdown field changed' do
     before do
       thing.bar = 'OK'