fix merge conflict

HHS · Mar 11, 2021 · e851018 · e851018
1 parent 1c29f3e
commit e851018
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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,6 +96,7 @@ describe('File Upload', () => {
         .expect(200)
         .then((res) => {
           fileId = res.body.id;
+          expect(uploadFile).toHaveBeenCalled();
         });
       expect(mockAddToScanQueue).toHaveBeenCalled();
       const file = await File.findOne({ where: { id: fileId } });