summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-06-05 16:30:51 +0000
committerDouwe Maan <douwe@gitlab.com>2019-06-05 16:30:51 +0000
commite7b6dace063fce593e6f9ac61390e7385a9868a1 (patch)
treeb8897de19496163809abc9547355df6b5a05327e /spec/helpers
parentec2f253a1ed8c0fe18cc677501d54cab36997c19 (diff)
parentea12c5aae83dd3f2edefce765438e94ff7c4f870 (diff)
downloadgitlab-ce-e7b6dace063fce593e6f9ac61390e7385a9868a1.tar.gz
Merge branch '54140-non-ar-cache-commit-markdown' into 'master'
Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/markup_helper_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
index c3956ba08fd..597c8f836a9 100644
--- a/spec/helpers/markup_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -78,7 +78,8 @@ describe MarkupHelper do
let(:link) { '/commits/0a1b2c3d' }
let(:issues) { create_list(:issue, 2, project: project) }
- it 'handles references nested in links with all the text' do
+ # Clean the cache to make sure the title is re-rendered from the stubbed one
+ it 'handles references nested in links with all the text', :clean_gitlab_redis_cache do
allow(commit).to receive(:title).and_return("This should finally fix #{issues[0].to_reference} and #{issues[1].to_reference} for real")
actual = helper.link_to_markdown_field(commit, :title, link)