diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-04-01 04:03:08 -0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-04-06 03:12:39 -0300 |
| commit | 61fe0a23977749b0a5dba41ca26101b4a03de720 (patch) | |
| tree | b11099156016838435ec25222ede9e061a2d0298 | |
| parent | 28266d9d610123d20333c6b05fcf83d1fb3e336a (diff) | |
| download | gitlab-ce-61fe0a23977749b0a5dba41ca26101b4a03de720.tar.gz | |
Fixed WikiPipeline and specs
| -rw-r--r-- | lib/banzai/pipeline/wiki_pipeline.rb | 2 | ||||
| -rw-r--r-- | spec/lib/banzai/pipeline/wiki_pipeline_spec.rb | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/banzai/pipeline/wiki_pipeline.rb b/lib/banzai/pipeline/wiki_pipeline.rb index 1cdb3808961..bcb89485dec 100644 --- a/lib/banzai/pipeline/wiki_pipeline.rb +++ b/lib/banzai/pipeline/wiki_pipeline.rb @@ -4,7 +4,7 @@ module Banzai def self.filters @filters ||= begin super.insert_after(Filter::TableOfContentsFilter, Filter::GollumTagsFilter) - .insert_after(Filter::GollumTagsFilter, Filter::WikiLinkFilter) + .insert_after(Filter::TableOfContentsFilter, Filter::WikiLinkFilter) end end end diff --git a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb index 3e25406e498..4f86b1d87e3 100644 --- a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb +++ b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb @@ -1,6 +1,9 @@ require 'rails_helper' describe Banzai::Pipeline::WikiPipeline do + let(:project_wiki) { double } + before(:each) { allow(project_wiki).to receive(:wiki_base_path) { '/some/repo/wikis' } } + describe 'TableOfContents' do it 'replaces the tag with the TableOfContentsFilter result' do markdown = <<-MD.strip_heredoc @@ -11,7 +14,7 @@ describe Banzai::Pipeline::WikiPipeline do Foo MD - result = described_class.call(markdown, project: spy, project_wiki: double) + result = described_class.call(markdown, project: spy, project_wiki: project_wiki) aggregate_failures do expect(result[:output].text).not_to include '[[' @@ -29,7 +32,7 @@ describe Banzai::Pipeline::WikiPipeline do Foo MD - output = described_class.to_html(markdown, project: spy, project_wiki: double) + output = described_class.to_html(markdown, project: spy, project_wiki: project_wiki) expect(output).to include('[[<em>toc</em>]]') end @@ -42,7 +45,7 @@ describe Banzai::Pipeline::WikiPipeline do Foo MD - output = described_class.to_html(markdown, project: spy, project_wiki: double) + output = described_class.to_html(markdown, project: spy, project_wiki: project_wiki) aggregate_failures do expect(output).not_to include('<ul>') |