Merged r14084, r14086 and r14087 from trunk to 3.0-stable (#19368)

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

2 files changed, 22 insertions, 1 deletions

diff --git a/test/integration/api_test/custom_fields_attribute_test.rb b/test/integration/api_test/custom_fields_attribute_test.rb
index a82fcfde0..15c2acfff 100644
--- a/test/integration/api_test/custom_fields_attribute_test.rb
+++ b/test/integration/api_test/custom_fields_attribute_test.rb
@@ -39,4 +39,25 @@ class Redmine::ApiTest::CustomFieldsAttributeTest < Redmine::ApiTest::Base
     group = Group.order('id DESC').first
     assert_equal "52", group.custom_field_value(field)
   end
+
+  def test_multivalued_custom_fields_should_accept_an_array
+    field = GroupCustomField.generate!(
+      :field_format => 'list',
+      :multiple => true,
+      :possible_values => ["V1", "V2", "V3"],
+      :default_value => "V2"
+    )
+
+payload = <<-JSON
+{"group": {"name":"Foooo",
+"custom_field_values":{"#{field.id}":["V1","V3"]}
+}
+}
+JSON
+
+    post '/groups.json', payload, {'CONTENT_TYPE' => 'application/json'}.merge(credentials('admin'))
+    assert_response :created
+    group = Group.order('id DESC').first
+    assert_equal ["V1", "V3"], group.custom_field_value(field).sort
+  end
 end
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 1825beb2c..8213834ba 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -432,7 +432,7 @@ JSON
 
     assert_response :created
     issue = Issue.order('id DESC').first
-    assert_equal ["V1", "V3"], issue.custom_field_value(field)
+    assert_equal ["V1", "V3"], issue.custom_field_value(field).sort
   end
 
   test "POST /issues.json with failure should return errors" do