Merge branch 'release_1.103.1'

app/controllers/pod_reports_controller.rb

@@ -13,7 +13,7 @@ def index
   def show
     respond_to do |format|
       response.headers['Content-Length'] = @pod_report.size.to_s
-      format.xls { send_file("public/reports/#{@pod_report.filename}", filename: @pod_report.filename) }
+      format.xls { send_file(Rails.root.join("public/reports/#{@pod_report.filename}"), filename: @pod_report.filename) }
     end
   end
 

app/models/pod_report.rb

@@ -20,6 +20,7 @@ def full_path
 
   def display_size
     megabytes = (size.to_f / 2**20).round(0)
+    megabytes = 1 if size > 0 && megabytes.zero? 
     if complete?
       megabytes.to_s
     elsif status.match '%'
@@ -30,10 +31,11 @@ def display_size
   end
 
   def size
-    begin
-      File.size(self.full_path)
-    rescue Errno::ENOENT
-      0
-    end
+    @size ||=
+      begin
+        File.exist?(self.full_path) ? File.size(self.full_path) : 0
+      rescue Errno::ENOENT
+        0
+      end
   end
 end

spec/models/pod_report_spec.rb

@@ -71,12 +71,36 @@
       end
     end
     context "with file present" do
-      before(:each) do
-        allow(File).to receive(:size).and_return(2**20)
-        allow(pod_report).to receive(:complete?).and_return(true)
+      context "with incomplete status" do
+        before(:each) do
+          allow(pod_report).to receive(:complete?).and_return(false)
+          allow(pod_report).to receive(:size).and_return(42 * 2**20)
+          allow(pod_report).to receive(:status).and_return("42% (ETA: tomorrow)")
+        end
+        it "returns current, projected total" do
+          expect(pod_report.display_size).to match /projected total/
+        end
       end
-      it "returns filesize in MB" do
-        expect(pod_report.display_size).to eq '1'
+      context "with complete status" do
+        before(:each) do
+          allow(pod_report).to receive(:complete?).and_return(true)
+        end
+        context "with a small file" do
+          before(:each) do
+            allow(pod_report).to receive(:size).and_return(42)
+          end
+          it "returns minimum of 1 MB" do
+            expect(pod_report.display_size).to eq '1'
+          end
+        end
+        context "with a large file" do
+          before(:each) do
+            allow(pod_report).to receive(:size).and_return(42 * 2**20)
+          end
+          it "returns minimum of 1 MB" do
+            expect(pod_report.display_size).to eq '42'
+          end
+        end
       end
     end
   end
@@ -90,8 +114,8 @@
     context "with file present" do
       let(:size) { 42 }
       before(:each) do
+        allow(File).to receive(:exist?).and_return(true)
         allow(File).to receive(:size).and_return(42)
-        allow(pod_report).to receive(:complete?).and_return(true)
       end
       it "returns filesize in MB" do
         expect(pod_report.size).to eq size