kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add path attribute to WikiFile class 

Fixes #39420
This commit is contained in:
Ahmad Sherif 2017-10-23 23:05:59 +02:00
parent 3ddffec0d6
commit 76becfb5b4
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/fix-add-path-attr-to-wiki-file.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix broken wiki pages that link to a wiki file
merge_request: 15019
author:
type: fixed

3
lib/gitlab/git/wiki_file.rb
View File

@ -1,7 +1,7 @@
module Gitlab module Gitlab
module Git module Git
class WikiFile class WikiFile
attr_reader :mime_type, :raw_data, :name attr_reader :mime_type, :raw_data, :name, :path
# This class is meant to be serializable so that it can be constructed # This class is meant to be serializable so that it can be constructed
# by Gitaly and sent over the network to GitLab. # by Gitaly and sent over the network to GitLab.
@ -13,6 +13,7 @@ module Gitlab
@mime_type = gollum_file.mime_type @mime_type = gollum_file.mime_type
@raw_data = gollum_file.raw_data @raw_data = gollum_file.raw_data
@name = gollum_file.name @name = gollum_file.name
@path = gollum_file.path
end end
end end
end end

10
spec/lib/banzai/filter/gollum_tags_filter_spec.rb
View File

@ -15,9 +15,13 @@ describe Banzai::Filter::GollumTagsFilter do
context 'linking internal images' do context 'linking internal images' do
it 'creates img tag if image exists' do it 'creates img tag if image exists' do
file = Gollum::File.new(project_wiki.wiki) gollum_file_double = double('Gollum::File',
expect(file).to receive(:path).and_return('images/image.jpg') mime_type: 'image/jpeg',
expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(file) name: 'images/image.jpg',
path: 'images/image.jpg',
raw_data: '')
wiki_file = Gitlab::Git::WikiFile.new(gollum_file_double)
expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(wiki_file)
tag = '[[images/image.jpg]]' tag = '[[images/image.jpg]]'
doc = filter("See #{tag}", project_wiki: project_wiki) doc = filter("See #{tag}", project_wiki: project_wiki)