diff options
author | Brett Walker <bwalker@gitlab.com> | 2019-01-11 18:31:00 -0600 |
---|---|---|
committer | Brett Walker <bwalker@gitlab.com> | 2019-01-21 15:07:40 -0600 |
commit | 7bc0fbe22f0dd2c96b596b591ef5dbf3eaae8dd3 (patch) | |
tree | e59cc0f740c8511a58d057f16864f9cf661cd8ec /spec/lib/banzai | |
parent | 45a04f93747a128588268395071f00d0af70acd7 (diff) | |
download | gitlab-ce-7bc0fbe22f0dd2c96b596b591ef5dbf3eaae8dd3.tar.gz |
Fix review comments
including refactoring, disabling sourcepos for pipelines that
don't need it, and minimizing spec changes by disabling
sourcepos when not testing for it explicitly.
Diffstat (limited to 'spec/lib/banzai')
-rw-r--r-- | spec/lib/banzai/filter/markdown_filter_spec.rb | 18 | ||||
-rw-r--r-- | spec/lib/banzai/pipeline/description_pipeline_spec.rb | 6 | ||||
-rw-r--r-- | spec/lib/banzai/pipeline/full_pipeline_spec.rb | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/spec/lib/banzai/filter/markdown_filter_spec.rb b/spec/lib/banzai/filter/markdown_filter_spec.rb index 62f68b5f0cb..4c4e821deab 100644 --- a/spec/lib/banzai/filter/markdown_filter_spec.rb +++ b/spec/lib/banzai/filter/markdown_filter_spec.rb @@ -30,21 +30,21 @@ describe Banzai::Filter::MarkdownFilter do end it 'adds language to lang attribute when specified' do - result = filter("```html\nsome code\n```") + result = filter("```html\nsome code\n```", no_sourcepos: true) - expect(result).to start_with('<pre data-sourcepos="1:1-3:3"><code lang="html">') + expect(result).to start_with('<pre><code lang="html">') end it 'does not add language to lang attribute when not specified' do - result = filter("```\nsome code\n```") + result = filter("```\nsome code\n```", no_sourcepos: true) - expect(result).to start_with('<pre data-sourcepos="1:1-3:3"><code>') + expect(result).to start_with('<pre><code>') end it 'works with utf8 chars in language' do - result = filter("```日\nsome code\n```") + result = filter("```日\nsome code\n```", no_sourcepos: true) - expect(result).to start_with('<pre data-sourcepos="1:1-3:3"><code lang="日">') + expect(result).to start_with('<pre><code lang="日">') end end @@ -80,7 +80,7 @@ describe Banzai::Filter::MarkdownFilter do end it 'disables data-sourcepos' do - result = filter('test', { no_sourcepos: true }) + result = filter('test', no_sourcepos: true) expect(result).to eq '<p>test</p>' end @@ -109,9 +109,9 @@ describe Banzai::Filter::MarkdownFilter do [^1]: a footnote MD - result = filter(text) + result = filter(text, no_sourcepos: true) - expect(result).to include('<td data-sourcepos="3:2-3:12">foot <sup') + expect(result).to include('<td>foot <sup') expect(result).to include('<section class="footnotes">') end end diff --git a/spec/lib/banzai/pipeline/description_pipeline_spec.rb b/spec/lib/banzai/pipeline/description_pipeline_spec.rb index 1f9d53c6345..77cb1954ea3 100644 --- a/spec/lib/banzai/pipeline/description_pipeline_spec.rb +++ b/spec/lib/banzai/pipeline/description_pipeline_spec.rb @@ -8,11 +8,15 @@ describe Banzai::Pipeline::DescriptionPipeline do output = described_class.to_html(html, project: spy) - output.gsub!(%r{\A<p #{MarkdownFeature::SOURCEPOS_REGEX} dir="auto">(.*)</p>(.*)\z}, '\1\2') if unwrap + output.gsub!(%r{\A<p dir="auto">(.*)</p>(.*)\z}, '\1\2') if unwrap output end + before do + stub_commonmark_sourcepos_disabled + end + it 'uses a limited whitelist' do doc = parse('# Description') diff --git a/spec/lib/banzai/pipeline/full_pipeline_spec.rb b/spec/lib/banzai/pipeline/full_pipeline_spec.rb index 3634655c6a5..aa503b6e1d5 100644 --- a/spec/lib/banzai/pipeline/full_pipeline_spec.rb +++ b/spec/lib/banzai/pipeline/full_pipeline_spec.rb @@ -54,6 +54,8 @@ describe Banzai::Pipeline::FullPipeline do end it 'properly adds the necessary ids and classes' do + stub_commonmark_sourcepos_disabled + expect(html.lines.map(&:strip).join("\n")).to eq filtered_footnote end end |