summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-12-03 13:52:07 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-12-03 13:52:07 +0000
commit735a83c596156e32f8cc686207eecddc029d7629 (patch)
tree3247605f58fde81458b096a4fa68b2837952031a /test/integration
parenteaf6bb1e9bc1ac3b5309f51ea9f76e6f95ba5813 (diff)
downloadredmine-735a83c596156e32f8cc686207eecddc029d7629.tar.gz
redmine-735a83c596156e32f8cc686207eecddc029d7629.zip
Converts IssuesController to use the new API template system and makes xml/json responses consistent (#6136).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4458 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/api_test/issues_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 1c1f3f8b7..d7bc785c0 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -74,7 +74,7 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
get '/issues.json?status_id=5'
json = ActiveSupport::JSON.decode(response.body)
- status_ids_used = json.collect {|j| j['status_id'] }
+ status_ids_used = json['issues'].collect {|j| j['status']['id'] }
assert_equal 3, status_ids_used.length
assert status_ids_used.all? {|id| id == 5 }
end
@@ -160,7 +160,7 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
end
json = ActiveSupport::JSON.decode(response.body)
- assert_equal "can't be blank", json.first['subject']
+ assert json['errors'].include?(['subject', "can't be blank"])
end
end
@@ -300,7 +300,7 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
put '/issues/6.json', @parameters, @headers
json = ActiveSupport::JSON.decode(response.body)
- assert_equal "can't be blank", json.first['subject']
+ assert json['errors'].include?(['subject', "can't be blank"])
end
end