lib/matchers/validations/inclusion.rb in mongoid-minitest-0.1.1 vs lib/matchers/validations/inclusion.rb in mongoid-minitest-0.1.2

- old
+ new

@@ -5,33 +5,42 @@ def initialize(field) super(field, :inclusion) end def to_allow(*values) - @allowed_values = values.flatten + @allowed_values = (values.length > 1) ? values.flatten : values[0] self end def matches?(subject) return false unless result = super(subject) - if @allowed_values + if Array === @allowed_values not_allowed_values = @allowed_values - @validator.options[:in].to_a if not_allowed_values.empty? @positive_message << ' allowing all values mentioned' else - @negative_message << ' not allowing the following the values:' + @negative_message << ' not allowing the following the values:' @negative_message << " #{not_allowed_values.inspect}" result = false end + elsif @allowed_values + if @allowed_values == @validator.options[:in] + @positive_message << " allowing values in #{@allowed_values.inspect}" + else + @negative_message << " allowing values in #{@validator.options[:in].inspect}" + result = false + end end result end def description - if @allowed_values + if Array === @allowed_values super << " allowing the values: #{to_sentence(@allowed_values)}" + elsif @allowed_values + super << " allowing the values in #{@allowed_values.inspect}" end end end def validate_inclusion_of(field)