diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-11 11:33:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-11 11:33:47 +0000 |
| commit | de19424ea5b5c273817732a28a7f7ca6073e4107 (patch) | |
| tree | c998a33a58735cd2075f0b39a9433ae458431721 | |
| parent | a89468ebc8a8aa082a667bbb1c44f095f8444579 (diff) | |
| download | redmine-de19424ea5b5c273817732a28a7f7ca6073e4107.tar.gz redmine-de19424ea5b5c273817732a28a7f7ca6073e4107.zip | |
Adds project status to GET /projects/:id and GET /projects API response (#15815).
git-svn-id: http://svn.redmine.org/redmine/trunk@12649 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/projects/index.api.rsb | 1 | ||||
| -rw-r--r-- | app/views/projects/show.api.rsb | 1 | ||||
| -rw-r--r-- | test/integration/api_test/projects_test.rb | 11 |
3 files changed, 7 insertions, 6 deletions
diff --git a/app/views/projects/index.api.rsb b/app/views/projects/index.api.rsb index 8fdea9bae..1aa5fe796 100644 --- a/app/views/projects/index.api.rsb +++ b/app/views/projects/index.api.rsb @@ -6,6 +6,7 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset api.identifier project.identifier api.description project.description api.parent(:id => project.parent.id, :name => project.parent.name) if project.parent && project.parent.visible? + api.status project.status render_api_custom_values project.visible_custom_field_values, api diff --git a/app/views/projects/show.api.rsb b/app/views/projects/show.api.rsb index a6f26f893..e84ebb073 100644 --- a/app/views/projects/show.api.rsb +++ b/app/views/projects/show.api.rsb @@ -5,6 +5,7 @@ api.project do api.description @project.description api.homepage @project.homepage api.parent(:id => @project.parent.id, :name => @project.parent.name) if @project.parent && @project.parent.visible? + api.status @project.status render_api_custom_values @project.visible_custom_field_values, api diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb index 723e783b1..441cd4844 100644 --- a/test/integration/api_test/projects_test.rb +++ b/test/integration/api_test/projects_test.rb @@ -49,8 +49,8 @@ class Redmine::ApiTest::ProjectsTest < Redmine::ApiTest::Base assert_response :success assert_equal 'application/xml', @response.content_type - assert_tag :tag => 'projects', - :child => {:tag => 'project', :child => {:tag => 'id', :content => '1'}} + assert_select 'projects>project>id', :text => '1' + assert_select 'projects>project>status', :text => '1' end test "GET /projects.json should return projects" do @@ -70,10 +70,9 @@ class Redmine::ApiTest::ProjectsTest < Redmine::ApiTest::Base assert_response :success assert_equal 'application/xml', @response.content_type - assert_tag :tag => 'project', - :child => {:tag => 'id', :content => '1'} - assert_tag :tag => 'custom_field', - :attributes => {:name => 'Development status'}, :content => 'Stable' + assert_select 'project>id', :text => '1' + assert_select 'project>status', :text => '1' + assert_select 'custom_field[name=Development status]', :text => 'Stable' assert_no_tag 'trackers' assert_no_tag 'issue_categories' |