Skip to content
Snippets Groups Projects
Commit caf84a03 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'

Add formatted_data attribute to Git::WikiPage

Closes #39805

See merge request gitlab-org/gitlab-ce!16682
parents a349a426 57357470
No related branches found
No related tags found
No related merge requests found
module Gitlab
module Git
class WikiPage
attr_reader :url_path, :title, :format, :path, :version, :raw_data, :name, :text_data, :historical
attr_reader :url_path, :title, :format, :path, :version, :raw_data, :name, :text_data, :historical, :formatted_data
 
# This class is meant to be serializable so that it can be constructed
# by Gitaly and sent over the network to GitLab.
Loading
Loading
@@ -21,6 +21,7 @@ module Gitlab
@raw_data = gollum_page.raw_data
@name = gollum_page.name
@historical = gollum_page.historical?
@formatted_data = gollum_page.formatted_data if gollum_page.is_a?(Gollum::Page)
 
@version = version
end
Loading
Loading
Loading
Loading
@@ -386,6 +386,17 @@ describe WikiPage do
end
end
 
describe '#formatted_content' do
it 'returns processed content of the page', :disable_gitaly do
subject.create({ title: "RDoc", content: "*bold*", format: "rdoc" })
page = wiki.find_page('RDoc')
expect(page.formatted_content).to eq("\n<p><strong>bold</strong></p>\n")
destroy_page('RDoc')
end
end
private
 
def remove_temp_repo(path)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment