diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-10 09:49:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-10 09:49:47 +0000 |
| commit | 7632d173e31698607ccb7ac5030e66f9ce7a07cc (patch) | |
| tree | 4745678eed70e9405bc288d09bd9009f2f329e0a | |
| parent | e774b8a6009d280b512bb75a25cbf64724cb947a (diff) | |
| download | redmine-7632d173e31698607ccb7ac5030e66f9ce7a07cc.tar.gz redmine-7632d173e31698607ccb7ac5030e66f9ce7a07cc.zip | |
Merged r12245 (#15235).
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12259 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/wiki/show.api.rsb | 2 | ||||
| -rw-r--r-- | test/integration/api_test/wiki_pages_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/wiki/show.api.rsb b/app/views/wiki/show.api.rsb index c35316104..8e082e123 100644 --- a/app/views/wiki/show.api.rsb +++ b/app/views/wiki/show.api.rsb @@ -6,7 +6,7 @@ api.wiki_page do api.text @content.text api.version @content.version api.author(:id => @content.author_id, :name => @content.author.name) - api.comments @page.content.comments + api.comments @content.comments api.created_on @page.created_on api.updated_on @content.updated_on diff --git a/test/integration/api_test/wiki_pages_test.rb b/test/integration/api_test/wiki_pages_test.rb index 02c764fa7..d299911a6 100644 --- a/test/integration/api_test/wiki_pages_test.rb +++ b/test/integration/api_test/wiki_pages_test.rb @@ -90,6 +90,7 @@ class Redmine::ApiTest::WikiPagesTest < Redmine::ApiTest::Base assert_select 'version', :text => '2' assert_select 'text' assert_select 'author' + assert_select 'comments', :text => 'Small update' assert_select 'created_on' assert_select 'updated_on' end |