diff --git a/app/views/plantings/_form.html.haml b/app/views/plantings/_form.html.haml index 52c432fe7..8b2c1af53 100644 --- a/app/views/plantings/_form.html.haml +++ b/app/views/plantings/_form.html.haml @@ -8,7 +8,7 @@ .control-group = f.label 'What did you plant?', :class => 'control-label' - .controls= collection_select(:planting, :crop_id, Crop.all(:order => :system_name), :id, :system_name, :selected => @crop.id) + .controls= collection_select(:planting, :crop_id, Crop.order("lower(system_name) ASC").all, :id, :system_name, :selected => @crop.id) .control-group = f.label 'Where did you plant it?', :class => 'control-label' .controls= collection_select(:planting, :garden_id, diff --git a/spec/factories/crop.rb b/spec/factories/crop.rb index ae36699ba..e761a2f8e 100644 --- a/spec/factories/crop.rb +++ b/spec/factories/crop.rb @@ -30,6 +30,10 @@ FactoryGirl.define do system_name "Pear" end + factory :lowercasecrop do + system_name "ffrench bean" + end + end end diff --git a/spec/views/plantings/_form.html.haml_spec.rb b/spec/views/plantings/_form.html.haml_spec.rb new file mode 100644 index 000000000..944375ebc --- /dev/null +++ b/spec/views/plantings/_form.html.haml_spec.rb @@ -0,0 +1,23 @@ +require 'spec_helper' + +describe "plantings/_form" do + before(:each) do + @member = FactoryGirl.create(:member) + @garden = FactoryGirl.create(:garden, :owner => @member) + @crop = FactoryGirl.create(:tomato) + FactoryGirl.create(:lowercasecrop) + + @planting = FactoryGirl.create(:planting, + :garden => @garden, + :crop => @crop + ) + render + end + + context "logged in" do + it "orders crops alphabetically" do + rendered.should =~ /ffrench bean.*Tomato/m + end + end +end +