Commit c39e4707 authored by jplang's avatar jplang

CustomField#possible_values may raise undefined method `force_encoding' error (#19316).

git-svn-id: https://svn.redmine.org/redmine/trunk@14079 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 4870483f
......@@ -118,7 +118,7 @@ class CustomField < ActiveRecord::Base
values = read_attribute(:possible_values)
if values.is_a?(Array)
values.each do |value|
value.force_encoding('UTF-8')
value.to_s.force_encoding('UTF-8')
end
values
else
......@@ -129,7 +129,7 @@ class CustomField < ActiveRecord::Base
# Makes possible_values accept a multiline string
def possible_values=(arg)
if arg.is_a?(Array)
values = arg.compact.collect(&:strip).select {|v| !v.blank?}
values = arg.compact.map {|a| a.to_s.strip}.reject(&:blank?)
write_attribute(:possible_values, values)
else
self.possible_values = arg.to_s.split(/[\n\r]+/)
......
......@@ -85,12 +85,26 @@ class CustomFieldTest < ActiveSupport::TestCase
assert_equal ["One value"], field.possible_values
end
def test_possible_values_should_stringify_values
field = CustomField.new
field.possible_values = [1, 2]
assert_equal ["1", "2"], field.possible_values
end
def test_possible_values_should_accept_a_string
field = CustomField.new
field.possible_values = "One value"
assert_equal ["One value"], field.possible_values
end
def test_possible_values_should_return_utf8_encoded_strings
field = CustomField.new
s = "Value".force_encoding('BINARY')
field.possible_values = s
assert_equal [s], field.possible_values
assert_equal 'UTF-8', field.possible_values.first.encoding.name
end
def test_possible_values_should_accept_a_multiline_string
field = CustomField.new
field.possible_values = "One value\nAnd another one \r\n \n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment