From 062add32dc5a9aff98b3a84d8b7c492e8f4e584e Mon Sep 17 00:00:00 2001 From: Mackenzie Morgan Date: Sun, 4 May 2014 22:46:45 -0400 Subject: [PATCH] Add 'root/tuber' to 'planted from:' list, for things like potatoes --- app/models/planting.rb | 3 ++- spec/models/planting_spec.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/planting.rb b/app/models/planting.rb index 289c84343..00f4ba11d 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -43,7 +43,8 @@ class Planting < ActiveRecord::Base 'bare root plant', 'advanced plant', 'graft', - 'layering' + 'layering', + 'root/tuber' ] validates :planted_from, :inclusion => { :in => PLANTED_FROM_VALUES, :message => "%{value} is not a valid planting method" }, diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb index e8d916300..eae16cbe5 100644 --- a/spec/models/planting_spec.rb +++ b/spec/models/planting_spec.rb @@ -110,7 +110,7 @@ describe Planting do it 'all valid planted_from values should work' do ['seed', 'seedling', 'cutting', 'root division', 'runner', 'bare root plant', 'advanced plant', - 'graft', 'layering', 'bulb', nil, ''].each do |p| + 'graft', 'layering', 'bulb', 'root/tuber', nil, ''].each do |p| @planting = FactoryGirl.build(:planting, :planted_from => p) @planting.should be_valid end