Merged r12245 (#15235).

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12259 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/wiki/show.api.rsb b/app/views/wiki/show.api.rsb
index c353161049ff9c76cfe036e93e7089b097bbecde..8e082e123bcf93bb609df70b2fb9ea3738708a52 100644 (file)
--- 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 02c764fa754c074f72917dcff95833816585d148..d299911a62ceb9119fe8f7ef7b1a0406f10ff5d2 100644 (file)
--- 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