meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r21414 to 4.2-stable (#36494).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21420 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-02-20 15:52:53 +00:00
parent c428bce1e1
commit 31eb388f26
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/wiki/show.api.rsb
View File

@ -5,7 +5,7 @@ api.wiki_page do
end
api.text @content.text
api.version @content.version
api.author(:id => @content.author_id, :name => @content.author.name)
api.author(:id => @content.author_id, :name => @content.author.name) unless @content.author_id.nil?
api.comments @content.comments
api.created_on @page.created_on
api.updated_on @content.updated_on

11
test/integration/api_test/wiki_pages_test.rb
View File

@ -126,6 +126,17 @@ class Redmine::ApiTest::WikiPagesTest < Redmine::ApiTest::Base
assert_equal 'jsmith', page.content.author.login
end
test "GET /projects/:project_id/wiki/:title/:version.xml should not includ author if not exists" do
WikiContentVersion.find_by_id(2).update(author_id: nil)
get '/projects/ecookbook/wiki/CookBook_documentation/2.xml'
assert_response 200
assert_equal 'application/xml', response.media_type
assert_select 'wiki_page' do
assert_select 'author', 0
end
end
test "PUT /projects/:project_id/wiki/:title.xml with current versino should update wiki page" do
assert_no_difference 'WikiPage.count' do
assert_difference 'WikiContent::Version.count' do