From ab6a93b029b236f94a0c33cc0282f0af22b646b5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 10 Dec 2010 12:22:37 +0000
Subject: [PATCH] Changes the representation of journal details in issue API.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4483 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.api.rsb            |  5 +++-
 test/integration/api_test/issues_test.rb | 34 ++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb
index 02e7fdd29..9f0d59e8d 100644
--- a/app/views/issues/show.api.rsb
+++ b/app/views/issues/show.api.rsb
@@ -50,7 +50,10 @@ api.issue do
   			api.notes journal.notes
   			api.array :details do
   				journal.details.each do |detail|
-  					api.detail :property => detail.property, :name => detail.prop_key, :old => detail.old_value, :new => detail.value
+  					api.detail :property => detail.property, :name => detail.prop_key do
+  					  api.old_value detail.old_value
+  					  api.new_value detail.value
+  					end
   				end
   			end
   		end
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index a5281e5eb..3988ee5b7 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -91,6 +91,40 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
   end
   
   context "GET /issues/:id" do
+    context "with journals" do
+      context ".xml" do
+        should "display journals" do
+          get '/issues/1.xml'
+          
+          assert_tag :tag => 'issue',
+            :child => {
+              :tag => 'journals',
+              :attributes => { :type => 'array' },
+              :child => {
+                :tag => 'journal',
+                :attributes => { :id => '1'},
+                :child => {
+                  :tag => 'details',
+                  :attributes => { :type => 'array' },
+                  :child => {
+                    :tag => 'detail',
+                    :attributes => { :name => 'status_id' },
+                    :child => {
+                      :tag => 'old_value',
+                      :content => '1',
+                      :sibling => {
+                        :tag => 'new_value',
+                        :content => '2'
+                      }
+                    }
+                  }
+                }
+              }
+            }
+        end
+      end
+    end
+    
     context "with custom fields" do
       context ".xml" do
         should "display custom fields" do
-- 
2.39.5