diff options
| -rw-r--r-- | app/views/custom_fields/index.api.rsb | 1 | ||||
| -rw-r--r-- | test/integration/api_test/custom_fields_test.rb | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/views/custom_fields/index.api.rsb b/app/views/custom_fields/index.api.rsb index 77c9cf3b3..8233ed140 100644 --- a/app/views/custom_fields/index.api.rsb +++ b/app/views/custom_fields/index.api.rsb @@ -21,6 +21,7 @@ api.array :custom_fields do values.each do |label, value| api.possible_value do api.value value || label + api.label label end end end diff --git a/test/integration/api_test/custom_fields_test.rb b/test/integration/api_test/custom_fields_test.rb index 54f8b8966..c3efa6b9b 100644 --- a/test/integration/api_test/custom_fields_test.rb +++ b/test/integration/api_test/custom_fields_test.rb @@ -32,10 +32,25 @@ class Redmine::ApiTest::CustomFieldsTest < Redmine::ApiTest::Base assert_select 'customized_type', :text => 'issue' assert_select 'possible_values[type=array]' do assert_select 'possible_value>value', :text => 'PostgreSQL' + assert_select 'possible_value>label', :text => 'PostgreSQL' end assert_select 'trackers[type=array]' assert_select 'roles[type=array]' end end end + + test "GET /custom_fields.xml should include value and label for enumeration custom fields" do + field = IssueCustomField.generate!(:field_format => 'enumeration') + foo = field.enumerations.create!(:name => 'Foo') + bar = field.enumerations.create!(:name => 'Bar') + + get '/custom_fields.xml', {}, credentials('admin') + assert_response :success + + assert_select 'possible_value' do + assert_select "value:contains(?) + label:contains(?)", foo.id.to_s, 'Foo' + assert_select "value:contains(?) + label:contains(?)", bar.id.to_s, 'Bar' + end + end end |