From 8d2fe8809dd3c4f0abb7dc2008eb5233eb1d069e Mon Sep 17 00:00:00 2001 From: Miles Gould Date: Fri, 25 Jan 2013 11:10:37 +0000 Subject: [PATCH] Add an uppercase crop factory. Use it to test that crops are sorted alphabetically in the plantings form. --- spec/factories/crop.rb | 6 ++++++ spec/views/plantings/_form.html.haml_spec.rb | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/spec/factories/crop.rb b/spec/factories/crop.rb index e761a2f8e..4ae2367d0 100644 --- a/spec/factories/crop.rb +++ b/spec/factories/crop.rb @@ -30,10 +30,16 @@ FactoryGirl.define do system_name "Pear" end + # This should have a name that is alphabetically earlier than :uppercase + # crop to ensure that the ordering tests work. factory :lowercasecrop do system_name "ffrench bean" end + factory :uppercasecrop do + system_name "Swiss chard" + end + end end diff --git a/spec/views/plantings/_form.html.haml_spec.rb b/spec/views/plantings/_form.html.haml_spec.rb index 944375ebc..6c81c85ba 100644 --- a/spec/views/plantings/_form.html.haml_spec.rb +++ b/spec/views/plantings/_form.html.haml_spec.rb @@ -4,8 +4,9 @@ describe "plantings/_form" do before(:each) do @member = FactoryGirl.create(:member) @garden = FactoryGirl.create(:garden, :owner => @member) - @crop = FactoryGirl.create(:tomato) - FactoryGirl.create(:lowercasecrop) + @uppercase = FactoryGirl.create(:uppercasecrop) + @lowercase = FactoryGirl.create(:lowercasecrop) + @crop = @lowercase # needed to render the form @planting = FactoryGirl.create(:planting, :garden => @garden, @@ -16,7 +17,7 @@ describe "plantings/_form" do context "logged in" do it "orders crops alphabetically" do - rendered.should =~ /ffrench bean.*Tomato/m + rendered.should =~ /#{@lowercase.system_name}.*#{@uppercase.system_name}/m end end end