Add latest changes from gitlab-org/gitlab@master

4 files changed, 17 insertions, 17 deletions

diff --git a/spec/lib/banzai/filter/markdown_filter_spec.rb b/spec/lib/banzai/filter/markdown_filter_spec.rb
index a310de5c015..1c9b894e885 100644
--- a/spec/lib/banzai/filter/markdown_filter_spec.rb
+++ b/spec/lib/banzai/filter/markdown_filter_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Banzai::Filter::MarkdownFilter do
         it 'adds language to lang attribute when specified' do
           result = filter("```html\nsome code\n```", no_sourcepos: true)
 
-          if Feature.enabled?(:use_cmark_renderer)
+          if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
             expect(result).to start_with('<pre lang="html"><code>')
           else
             expect(result).to start_with('<pre><code lang="html">')
@@ -49,7 +49,7 @@ RSpec.describe Banzai::Filter::MarkdownFilter do
         it 'works with utf8 chars in language' do
           result = filter("```日\nsome code\n```", no_sourcepos: true)
 
-          if Feature.enabled?(:use_cmark_renderer)
+          if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
             expect(result).to start_with('<pre lang="日"><code>')
           else
             expect(result).to start_with('<pre><code lang="日">')
@@ -59,7 +59,7 @@ RSpec.describe Banzai::Filter::MarkdownFilter do
         it 'works with additional language parameters' do
           result = filter("```ruby:red gem foo\nsome code\n```", no_sourcepos: true)
 
-          if Feature.enabled?(:use_cmark_renderer)
+          if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
             expect(result).to start_with('<pre lang="ruby:red" data-meta="gem foo"><code>')
           else
             expect(result).to start_with('<pre><code lang="ruby:red gem foo">')
@@ -102,7 +102,7 @@ RSpec.describe Banzai::Filter::MarkdownFilter do
 
         expect(result).to include('<td>foot <sup')
 
-        if Feature.enabled?(:use_cmark_renderer)
+        if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
           expect(result).to include('<section class="footnotes" data-footnotes>')
         else
           expect(result).to include('<section class="footnotes">')
diff --git a/spec/lib/banzai/filter/plantuml_filter_spec.rb b/spec/lib/banzai/filter/plantuml_filter_spec.rb
index d1a3b5689a8..e1e02c09fbe 100644
--- a/spec/lib/banzai/filter/plantuml_filter_spec.rb
+++ b/spec/lib/banzai/filter/plantuml_filter_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Banzai::Filter::PlantumlFilter do
     it 'replaces plantuml pre tag with img tag' do
       stub_application_setting(plantuml_enabled: true, plantuml_url: "http://localhost:8080")
 
-      input = if Feature.enabled?(:use_cmark_renderer)
+      input = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                 '<pre lang="plantuml"><code>Bob -> Sara : Hello</code></pre>'
               else
                 '<pre><code lang="plantuml">Bob -> Sara : Hello</code></pre>'
@@ -24,7 +24,7 @@ RSpec.describe Banzai::Filter::PlantumlFilter do
     it 'does not replace plantuml pre tag with img tag if disabled' do
       stub_application_setting(plantuml_enabled: false)
 
-      if Feature.enabled?(:use_cmark_renderer)
+      if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
         input = '<pre lang="plantuml"><code>Bob -> Sara : Hello</code></pre>'
         output = '<pre lang="plantuml"><code>Bob -&gt; Sara : Hello</code></pre>'
       else
@@ -40,7 +40,7 @@ RSpec.describe Banzai::Filter::PlantumlFilter do
     it 'does not replace plantuml pre tag with img tag if url is invalid' do
       stub_application_setting(plantuml_enabled: true, plantuml_url: "invalid")
 
-      input = if Feature.enabled?(:use_cmark_renderer)
+      input = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                 '<pre lang="plantuml"><code>Bob -> Sara : Hello</code></pre>'
               else
                 '<pre><code lang="plantuml">Bob -> Sara : Hello</code></pre>'
diff --git a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
index dfe022b51d2..62e93cb1653 100644
--- a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
+++ b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
 
     context "when a valid language is specified" do
       it "highlights as that language" do
-        result = if Feature.enabled?(:use_cmark_renderer)
+        result = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                    filter('<pre lang="ruby"><code>def fun end</code></pre>')
                  else
                    filter('<pre><code lang="ruby">def fun end</code></pre>')
@@ -54,7 +54,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
 
     context "when an invalid language is specified" do
       it "highlights as plaintext" do
-        result = if Feature.enabled?(:use_cmark_renderer)
+        result = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                    filter('<pre lang="gnuplot"><code>This is a test</code></pre>')
                  else
                    filter('<pre><code lang="gnuplot">This is a test</code></pre>')
@@ -73,7 +73,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
       %w(math mermaid plantuml suggestion).each do |lang|
         context "when #{lang} is specified" do
           it "highlights as plaintext but with the correct language attribute and class" do
-            result = if Feature.enabled?(:use_cmark_renderer)
+            result = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                        filter(%{<pre lang="#{lang}"><code>This is a test</code></pre>})
                      else
                        filter(%{<pre><code lang="#{lang}">This is a test</code></pre>})
@@ -89,7 +89,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
           let(:lang_params) { 'foo-bar-kux' }
 
           let(:xss_lang) do
-            if Feature.enabled?(:use_cmark_renderer)
+            if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
               "#{lang} data-meta=\"foo-bar-kux\"&lt;script&gt;alert(1)&lt;/script&gt;"
             else
               "#{lang}#{described_class::LANG_PARAMS_DELIMITER}&lt;script&gt;alert(1)&lt;/script&gt;"
@@ -97,7 +97,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
           end
 
           it "includes data-lang-params tag with extra information" do
-            result = if Feature.enabled?(:use_cmark_renderer)
+            result = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                        filter(%{<pre lang="#{lang}" data-meta="#{lang_params}"><code>This is a test</code></pre>})
                      else
                        filter(%{<pre><code lang="#{lang}#{delimiter}#{lang_params}">This is a test</code></pre>})
@@ -108,7 +108,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
 
           include_examples "XSS prevention", lang
 
-          if Feature.enabled?(:use_cmark_renderer)
+          if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
             include_examples "XSS prevention",
                              "#{lang} data-meta=\"foo-bar-kux\"&lt;script&gt;alert(1)&lt;/script&gt;"
           else
@@ -131,7 +131,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
 
         context 'when delimiter is space' do
           it 'delimits on the first appearance' do
-            if Feature.enabled?(:use_cmark_renderer)
+            if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
               result = filter(%{<pre lang="#{lang}" data-meta="#{lang_params} more-things"><code>This is a test</code></pre>})
 
               expect(result.to_html).to eq(expected_result)
@@ -147,7 +147,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
           it 'delimits on the first appearance' do
             result = filter(%{<pre lang="#{lang}#{delimiter}#{lang_params} more-things"><code>This is a test</code></pre>})
 
-            if Feature.enabled?(:use_cmark_renderer)
+            if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
               expect(result.to_html).to eq(expected_result)
             else
               expect(result.to_html).to eq(%{<pre class=\"code highlight js-syntax-highlight language-plaintext\" lang=\"plaintext\" v-pre=\"true\"><code><span id=\"LC1\" class=\"line\" lang=\"plaintext\">This is a test</span></code></pre>})
@@ -173,7 +173,7 @@ RSpec.describe Banzai::Filter::SyntaxHighlightFilter do
       end
 
       it "highlights as plaintext" do
-        result = if Feature.enabled?(:use_cmark_renderer)
+        result = if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
                    filter('<pre lang="ruby"><code>This is a test</code></pre>')
                  else
                    filter('<pre><code lang="ruby">This is a test</code></pre>')
diff --git a/spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb b/spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb
index 394fcc06eba..c8cd9d4fcac 100644
--- a/spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb
@@ -71,7 +71,7 @@ RSpec.describe Banzai::Pipeline::PlainMarkdownPipeline do
         let(:markdown) { %Q(``` foo\\@bar\nfoo\n```) }
 
         it 'renders correct html' do
-          if Feature.enabled?(:use_cmark_renderer)
+          if Feature.enabled?(:use_cmark_renderer, default_enabled: :yaml)
             correct_html_included(markdown, %Q(<pre data-sourcepos="1:1-3:3" lang="foo@bar"><code>foo\n</code></pre>))
           else
             correct_html_included(markdown, %Q(<code lang="foo@bar">foo\n</code>))