BigW Consortium Gitlab

Commit dc606496 by Sean McGivern Committed by Winnie Hellmann

Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'

Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019 (cherry picked from commit 98c57e9a) 76becfb5 Add path attribute to WikiFile class
parent 80a99054
---
title: Fix broken wiki pages that link to a wiki file
merge_request: 15019
author:
type: fixed
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 ...@@ -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
......
...@@ -15,9 +15,13 @@ describe Banzai::Filter::GollumTagsFilter do ...@@ -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)
......
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