diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-08 10:32:50 +0530 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-09 10:15:01 +0530 |
commit | e6b1d1669b362ad4cea27ac44e89e73f4d6e92fd (patch) | |
tree | c95b552cb18d42067161429cc738a40a3794b467 /spec/features/markdown_spec.rb | |
parent | 8e71c19a6940b8d82c70ee9b2550b62b5169eb54 (diff) | |
download | gitlab-ce-e6b1d1669b362ad4cea27ac44e89e73f4d6e92fd.tar.gz |
Hook up the updated `WikiLinkFilter` to the wiki controllers.
- Need to pass in a `page_slug` to the filter, so it can rewrite based
on the current page (all links are rewritten to the level of the app root).
- The earlier `markdown_preview` endpoint was at the level of the wiki.
We need to know the current page (for rewriting, as above), so this
commit moves the endpoint to the level of a wiki page.
- Fix all tests
Diffstat (limited to 'spec/features/markdown_spec.rb')
-rw-r--r-- | spec/features/markdown_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb index 1d892fe1a55..07275bfb3d8 100644 --- a/spec/features/markdown_spec.rb +++ b/spec/features/markdown_spec.rb @@ -231,13 +231,14 @@ describe 'GitLab Markdown', feature: true do context 'wiki pipeline' do before do @project_wiki = @feat.project_wiki + @project_wiki_page = @feat.project_wiki_page file = Gollum::File.new(@project_wiki.wiki) expect(file).to receive(:path).and_return('images/example.jpg') expect(@project_wiki).to receive(:find_file).with('images/example.jpg').and_return(file) allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' } - @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki }) + @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki, page_slug: @project_wiki_page.slug }) end it_behaves_like 'all pipelines' |