diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/support/helpers/stub_gitlab_calls.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/support/helpers/stub_gitlab_calls.rb')
-rw-r--r-- | spec/support/helpers/stub_gitlab_calls.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/support/helpers/stub_gitlab_calls.rb b/spec/support/helpers/stub_gitlab_calls.rb index 6f530d57caf..ef3c39c83c2 100644 --- a/spec/support/helpers/stub_gitlab_calls.rb +++ b/spec/support/helpers/stub_gitlab_calls.rb @@ -92,9 +92,16 @@ module StubGitlabCalls end def stub_commonmark_sourcepos_disabled + render_options = + if Feature.enabled?(:use_cmark_renderer) + Banzai::Filter::MarkdownEngines::CommonMark::RENDER_OPTIONS_C + else + Banzai::Filter::MarkdownEngines::CommonMark::RENDER_OPTIONS_RUBY + end + allow_any_instance_of(Banzai::Filter::MarkdownEngines::CommonMark) .to receive(:render_options) - .and_return(Banzai::Filter::MarkdownEngines::CommonMark::RENDER_OPTIONS) + .and_return(render_options) end private |