Commit 4aff8238 authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch 'fix-rubocop-offenses' into 'master'

Fix RuboCop offenses

See merge request gitlab-org/gitlab!54851
parents 07c16eec f1ecf2b7
...@@ -12,8 +12,8 @@ module Banzai ...@@ -12,8 +12,8 @@ module Banzai
def customize_allowlist(allowlist) def customize_allowlist(allowlist)
# Allow table alignment; we allow specific text-align values in a # Allow table alignment; we allow specific text-align values in a
# transformer below # transformer below
allowlist[:attributes]['th'] = %w(style) allowlist[:attributes]['th'] = %w[style]
allowlist[:attributes]['td'] = %w(style) allowlist[:attributes]['td'] = %w[style]
allowlist[:css] = { properties: ['text-align'] } allowlist[:css] = { properties: ['text-align'] }
# Allow the 'data-sourcepos' from CommonMark on all elements # Allow the 'data-sourcepos' from CommonMark on all elements
...@@ -25,7 +25,7 @@ module Banzai ...@@ -25,7 +25,7 @@ module Banzai
# Allow `id` in a and li elements for footnotes # Allow `id` in a and li elements for footnotes
# and remove any `id` properties not matching for footnotes # and remove any `id` properties not matching for footnotes
allowlist[:attributes]['a'].push('id') allowlist[:attributes]['a'].push('id')
allowlist[:attributes]['li'] = %w(id) allowlist[:attributes]['li'] = %w[id]
allowlist[:transformers].push(self.class.remove_non_footnote_ids) allowlist[:transformers].push(self.class.remove_non_footnote_ids)
allowlist allowlist
......
...@@ -33,14 +33,14 @@ RSpec.describe Banzai::Filter::SanitizationFilter do ...@@ -33,14 +33,14 @@ RSpec.describe Banzai::Filter::SanitizationFilter do
end end
it 'sanitizes `class` attribute from all elements' do it 'sanitizes `class` attribute from all elements' do
act = %q{<pre class="code highlight white c"><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>} act = %q(<pre class="code highlight white c"><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>)
exp = %q{<pre><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>} exp = %q(<pre><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>)
expect(filter(act).to_html).to eq exp expect(filter(act).to_html).to eq exp
end end
it 'sanitizes `class` attribute from non-highlight spans' do it 'sanitizes `class` attribute from non-highlight spans' do
act = %q{<span class="k">def</span>} act = %q(<span class="k">def</span>)
expect(filter(act).to_html).to eq %q{<span>def</span>} expect(filter(act).to_html).to eq %q(<span>def</span>)
end end
it 'allows `text-align` property in `style` attribute on table elements' do it 'allows `text-align` property in `style` attribute on table elements' do
...@@ -82,12 +82,12 @@ RSpec.describe Banzai::Filter::SanitizationFilter do ...@@ -82,12 +82,12 @@ RSpec.describe Banzai::Filter::SanitizationFilter do
end end
it 'allows `span` elements' do it 'allows `span` elements' do
exp = act = %q{<span>Hello</span>} exp = act = %q(<span>Hello</span>)
expect(filter(act).to_html).to eq exp expect(filter(act).to_html).to eq exp
end end
it 'allows `abbr` elements' do it 'allows `abbr` elements' do
exp = act = %q{<abbr title="HyperText Markup Language">HTML</abbr>} exp = act = %q(<abbr title="HyperText Markup Language">HTML</abbr>)
expect(filter(act).to_html).to eq exp expect(filter(act).to_html).to eq exp
end end
...@@ -132,7 +132,7 @@ RSpec.describe Banzai::Filter::SanitizationFilter do ...@@ -132,7 +132,7 @@ RSpec.describe Banzai::Filter::SanitizationFilter do
end end
it 'allows the `data-sourcepos` attribute globally' do it 'allows the `data-sourcepos` attribute globally' do
exp = %q{<p data-sourcepos="1:1-1:10">foo/bar.md</p>} exp = %q(<p data-sourcepos="1:1-1:10">foo/bar.md</p>)
act = filter(exp) act = filter(exp)
expect(act.to_html).to eq exp expect(act.to_html).to eq exp
...@@ -140,41 +140,41 @@ RSpec.describe Banzai::Filter::SanitizationFilter do ...@@ -140,41 +140,41 @@ RSpec.describe Banzai::Filter::SanitizationFilter do
describe 'footnotes' do describe 'footnotes' do
it 'allows correct footnote id property on links' do it 'allows correct footnote id property on links' do
exp = %q{<a href="#fn1" id="fnref1">foo/bar.md</a>} exp = %q(<a href="#fn1" id="fnref1">foo/bar.md</a>)
act = filter(exp) act = filter(exp)
expect(act.to_html).to eq exp expect(act.to_html).to eq exp
end end
it 'allows correct footnote id property on li element' do it 'allows correct footnote id property on li element' do
exp = %q{<ol><li id="fn1">footnote</li></ol>} exp = %q(<ol><li id="fn1">footnote</li></ol>)
act = filter(exp) act = filter(exp)
expect(act.to_html).to eq exp expect(act.to_html).to eq exp
end end
it 'removes invalid id for footnote links' do it 'removes invalid id for footnote links' do
exp = %q{<a href="#fn1">link</a>} exp = %q(<a href="#fn1">link</a>)
%w[fnrefx test xfnref1].each do |id| %w[fnrefx test xfnref1].each do |id|
act = filter(%Q{<a href="#fn1" id="#{id}">link</a>}) act = filter(%(<a href="#fn1" id="#{id}">link</a>))
expect(act.to_html).to eq exp expect(act.to_html).to eq exp
end end
end end
it 'removes invalid id for footnote li' do it 'removes invalid id for footnote li' do
exp = %q{<ol><li>footnote</li></ol>} exp = %q(<ol><li>footnote</li></ol>)
%w[fnx test xfn1].each do |id| %w[fnx test xfn1].each do |id|
act = filter(%Q{<ol><li id="#{id}">footnote</li></ol>}) act = filter(%(<ol><li id="#{id}">footnote</li></ol>))
expect(act.to_html).to eq exp expect(act.to_html).to eq exp
end end
end end
it 'allows footnotes numbered higher than 9' do it 'allows footnotes numbered higher than 9' do
exp = %q{<a href="#fn15" id="fnref15">link</a><ol><li id="fn15">footnote</li></ol>} exp = %q(<a href="#fn15" id="fnref15">link</a><ol><li id="fn15">footnote</li></ol>)
act = filter(exp) act = filter(exp)
expect(act.to_html).to eq exp expect(act.to_html).to eq exp
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment