From 786fde901295435095881697b4a38bb9b9735970 Mon Sep 17 00:00:00 2001
From: Josh Salisbury <josh@adhocteam.us>
Date: Thu, 11 Mar 2021 13:23:05 -0600
Subject: [PATCH] Try again to fix backend tests

---
 src/routes/files/handlers.test.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index 9aec3dad6e..ed196d6853 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -80,9 +80,11 @@ describe('File Upload', () => {
   });
 
   describe('File Upload Handlers happy path', () => {
-    beforeEach(async () => {
+    beforeEach(() => {
       uploadFile.mockReset();
       getPresignedURL.mockReset();
+    });
+    it('tests a file upload', async () => {
       ActivityReportPolicy.mockImplementation(() => ({
         canUpdate: () => true,
       }));
@@ -94,16 +96,9 @@ describe('File Upload', () => {
         .expect(200)
         .then((res) => {
           fileId = res.body.id;
+          expect(uploadFile).toHaveBeenCalled();
         });
-    });
-    it('tests a file upload', async () => {
-      expect(uploadFile).toHaveBeenCalled();
       expect(mockAddToScanQueue).toHaveBeenCalled();
-    });
-    it('checks the metadata was uploaded to the database', async () => {
-      ActivityReportPolicy.mockImplementation(() => ({
-        canUpdate: () => true,
-      }));
       const file = await File.findOne({ where: { id: fileId } });
       const uuid = file.dataValues.key.slice(0, -4);
       expect(file.dataValues.id).toBe(fileId);
@@ -117,7 +112,7 @@ describe('File Upload', () => {
         canUpdate: () => false,
       }));
       await request(app)
-        .delete(`/api/files/${report.dataValues.id}/${fileId}`)
+        .delete(`/api/files/${report.dataValues.id}/1`)
         .expect(403)
         .then(() => expect(deleteFileFromS3).not.toHaveBeenCalled());
     });
@@ -125,12 +120,18 @@ describe('File Upload', () => {
       ActivityReportPolicy.mockImplementation(() => ({
         canUpdate: () => true,
       }));
-      const file = await File.findOne({ where: { id: fileId } });
+      const file = await File.create({
+        activityReportId: report.dataValues.id,
+        originalFileName: 'name',
+        key: 'key',
+        status: 'UPLOADING',
+        fileSize: 0,
+      });
       await request(app)
-        .delete(`/api/files/${report.dataValues.id}/${fileId}`)
+        .delete(`/api/files/${report.dataValues.id}/${file.id}`)
         .expect(204);
       expect(deleteFileFromS3).toHaveBeenCalledWith(file.dataValues.key);
-      const noFile = await File.findOne({ where: { id: fileId } });
+      const noFile = await File.findOne({ where: { id: file.id } });
       expect(noFile).toBe(null);
     });
   });