fix test case and lint issues

opencollective · Dec 11, 2024 · 02ccd18 · 02ccd18
1 parent 2af5785
commit 02ccd18
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/server/graphql/common/expenses.ts b/server/graphql/common/expenses.ts
@@ -2003,12 +2003,7 @@ export async function submitExpenseDraft(
 
   await checkLockedFields(existingExpense, { ...expenseData, payee: requestedPayee || args.expense.payee });
 
-  const options = {
-    overrideRemoteUser: undefined,
-    skipPermissionCheck: true,
-    skipActivity: true,
-    draftKey: args.draftKey,
-  };
+  const options = { overrideRemoteUser: undefined, skipPermissionCheck: true, skipActivity: true };
   if (requestedPayee) {
     if (!req.remoteUser?.isAdminOfCollective(requestedPayee)) {
       throw new Unauthorized('User needs to be the admin of the payee to submit an expense on their behalf');
@@ -2156,11 +2151,7 @@ export async function sendDraftExpenseInvite(
   }
 }
 
-export async function editExpenseDraft(
-  req: express.Request,
-  expenseData: ExpenseData,
-  args: Record<string, any> & { draftKey?: string },
-) {
+export async function editExpenseDraft(req: express.Request, expenseData: ExpenseData, args: Record<string, any>) {
   const existingExpense = await models.Expense.findByPk(expenseData.id, {
     include: [{ model: models.ExpenseItem, as: 'items' }],
   });

diff --git a/server/graphql/v2/object/Expense.ts b/server/graphql/v2/object/Expense.ts
@@ -560,13 +560,15 @@ export const GraphQLExpense = new GraphQLObjectType<ExpenseModel, express.Reques
                 item.url = uploadedFile
                   ? UploadedFile.getProtectedURLFromOpenCollectiveS3Bucket(uploadedFile, {
                       expenseId: expense.id,
-                      draftKey: req?.remoteUser ? null : expense.data.draftKey,
+                      draftKey: req.remoteUser ? null : expense.data.draftKey,
                     })
                   : item.url;
               }
             }
 
-            draftData.items = items;
+            if (items.length > 0) {
+              draftData.items = items;
+            }
 
             const attachedFiles = (draftData.attachedFiles as { url?: string }[]) || [];
             for (const attachedFile of attachedFiles) {
@@ -576,13 +578,15 @@ export const GraphQLExpense = new GraphQLObjectType<ExpenseModel, express.Reques
                 attachedFile.url = uploadedFile
                   ? UploadedFile.getProtectedURLFromOpenCollectiveS3Bucket(uploadedFile, {
                       expenseId: expense.id,
-                      draftKey: req?.remoteUser ? null : expense.data.draftKey,
+                      draftKey: req.remoteUser ? null : expense.data.draftKey,
                     })
                   : attachedFile.url;
               }
             }
 
-            draftData.attachedFiles = attachedFiles;
+            if (attachedFiles.length > 0) {
+              draftData.attachedFiles = attachedFiles;
+            }
 
             return draftData;
           }

diff --git a/test/server/controllers/files.test.ts b/test/server/controllers/files.test.ts
@@ -175,10 +175,10 @@ describe('server/controllers/files', () => {
   });
 
   describe('authenticated access to files', () => {
-    it('should return 401 if not logged in', async () => {
+    it('should return 403 if not logged in', async () => {
       const response = await makeRequest(uploadedFile.id);
 
-      expect(response._getStatusCode()).to.eql(401);
+      expect(response._getStatusCode()).to.eql(403);
     });
 
     it('should return 400 if malformed request', async () => {

diff --git a/test/server/graphql/v2/mutation/ExpenseMutations.test.js b/test/server/graphql/v2/mutation/ExpenseMutations.test.js
@@ -4968,10 +4968,11 @@ describe('server/graphql/v2/mutation/ExpenseMutations', () => {
 
       result.errors && console.error(result.errors);
       expect(result.errors).to.not.exist;
+      const email = await waitForCondition(() => {
+        return emailLib.sendMessage.getCalls().find(call => call.firstArg === existingUser.email);
+      });
 
-      await waitForCondition(() => emailLib.sendMessage.thirdCall);
-
-      const [recipient] = emailLib.sendMessage.thirdCall.args;
+      const [recipient] = email.args;
       expect(recipient).to.eq(existingUser.email);
     });
 

diff --git a/test/test-helpers/fake-data.ts b/test/test-helpers/fake-data.ts
@@ -406,7 +406,7 @@ export const fakeUploadedFile = async (fileData: Partial<InferCreationAttributes
     fileName,
     fileType,
     ...fileData,
-    CreatedByUserId: <number>fileData.CreatedByUserId || (await fakeUser()).id,
+    CreatedByUserId: <number>fileData?.CreatedByUserId || (await fakeUser()).id,
   });
 };