From 2d55d88db85e4b4a12d7befcb0fb738c2753144e Mon Sep 17 00:00:00 2001 From: Mackenzie Morgan Date: Thu, 29 Jan 2015 00:49:23 -0500 Subject: [PATCH 1/2] fixing harvest csv so it doesn't error --- app/controllers/harvests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb index 3bc151d8c..5927f3df1 100644 --- a/app/controllers/harvests_controller.rb +++ b/app/controllers/harvests_controller.rb @@ -20,7 +20,7 @@ class HarvestsController < ApplicationController format.html { @harvests = @harvests.paginate(:page => params[:page]) } format.json { render json: @harvests } format.csv do - specifics = (@owner ? "#{@owner.name}-" : @crop ? "#{@crop.name}-" : nil) + specifics = (@owner ? "#{@owner.login_name}-" : @crop ? "#{@crop.name}-" : nil) @filename = "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(:number)}.csv" render :csv => @harvests end From 0da121a48d1b951909c96d4b0e77a0b2626aba17 Mon Sep 17 00:00:00 2001 From: Mackenzie Morgan Date: Thu, 29 Jan 2015 22:27:09 -0500 Subject: [PATCH 2/2] adding test for harvest csv --- spec/controllers/harvests_controller_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb index efbaf4697..efd762368 100644 --- a/spec/controllers/harvests_controller_spec.rb +++ b/spec/controllers/harvests_controller_spec.rb @@ -37,6 +37,11 @@ describe HarvestsController do assigns(:crop).should eq @maize assigns(:harvests).should eq [@harvest2] end + + it "generates a csv" do + get :index, {:format => "csv"} + response.status.should eq 200 + end end describe "GET show" do