From 76608a981c6cd40ce5b19ae73238fde4ee711b24 Mon Sep 17 00:00:00 2001 From: soborok Date: Sun, 8 Mar 2015 11:32:18 -0500 Subject: [PATCH] resolved issue-610 to display only active planting --- app/views/gardens/index.html.haml | 2 +- spec/features/gardens_spec.rb | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/gardens/index.html.haml b/app/views/gardens/index.html.haml index 2da0358659..749e761895 100644 --- a/app/views/gardens/index.html.haml +++ b/app/views/gardens/index.html.haml @@ -50,7 +50,7 @@ None - else %ul - - garden.plantings.each do |p| + - garden.plantings.current.each do |p| %li = p.quantity = link_to p.crop.name, p diff --git a/spec/features/gardens_spec.rb b/spec/features/gardens_spec.rb index 8f311804e6..31626d06fb 100644 --- a/spec/features/gardens_spec.rb +++ b/spec/features/gardens_spec.rb @@ -3,7 +3,8 @@ feature "Planting a crop", :js => true do let!(:garden) { FactoryGirl.create(:garden) } let!(:planting) { FactoryGirl.create(:planting, garden: garden, planted_at: Date.parse("2013-3-10")) } - + let!(:tomato) { FactoryGirl.create(:tomato) } + let!(:finished_planting) { FactoryGirl.create(:finished_planting, garden: garden, crop: tomato) } background do login_as(garden.owner) @@ -72,4 +73,9 @@ it_behaves_like "append date" end + scenario "List only active plantings on a garden" do + visit gardens_path + expect(page).not_to have_content finished_planting.crop_name + end + end