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 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