From b3582f7634488817fd67fc8f48c5bb990bcdd2c5 Mon Sep 17 00:00:00 2001
From: joseph-sentry <joseph.sawaya@sentry.io>
Date: Mon, 29 Jul 2024 11:42:16 -0400
Subject: [PATCH] test: fix tests

---
 src/buildExec.test.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/buildExec.test.ts b/src/buildExec.test.ts
index d83182b..f70aac7 100644
--- a/src/buildExec.test.ts
+++ b/src/buildExec.test.ts
@@ -278,18 +278,18 @@ test('commit args using context', async () => {
   ];
 
   const {commitExecArgs, commitCommand} = await buildCommitExec();
-  if (context.eventName == 'pull_request') {
-    expectedArgs.push('-C', `${context.payload.pull_request?.head.sha}`);
-  }
-  if (context.eventName == 'pull_request_target') {
-    expectedArgs.push('-P', `${context.payload.number}`);
-  }
   if (
     (context.eventName == 'pull_request' || context.eventName == 'pull_request_target') &&
     context.payload.pull_request?.base.label.split(':')[0] != context.payload.pull_request?.head.label.split(':')[0]
   ) {
     expectedArgs.push('-B', `${context.payload.pull_request?.head.label}`);
   }
+  if (context.eventName == 'pull_request') {
+    expectedArgs.push('-C', `${context.payload.pull_request?.head.sha}`);
+  }
+  if (context.eventName == 'pull_request_target') {
+    expectedArgs.push('-P', `${context.payload.number}`);
+  }
 
   expect(commitExecArgs).toEqual(expectedArgs);
   expect(commitCommand).toEqual('create-commit');
@@ -304,18 +304,18 @@ test('commit args using github server url', async () => {
   process.env.GITHUB_SERVER_URL = 'https://example.com';
 
   const {commitExecArgs, commitCommand} = await buildCommitExec();
-  if (context.eventName == 'pull_request') {
-    expectedArgs.push('-C', `${context.payload.pull_request?.head.sha}`);
-  }
-  if (context.eventName == 'pull_request_target') {
-    expectedArgs.push('-P', `${context.payload.number}`);
-  }
   if (
     (context.eventName == 'pull_request' || context.eventName == 'pull_request_target') &&
     context.payload.pull_request?.base.label.split(':')[0] != context.payload.pull_request?.head.label.split(':')[0]
   ) {
     expectedArgs.push('-B', `${context.payload.pull_request?.head.label}`);
   }
+  if (context.eventName == 'pull_request') {
+    expectedArgs.push('-C', `${context.payload.pull_request?.head.sha}`);
+  }
+  if (context.eventName == 'pull_request_target') {
+    expectedArgs.push('-P', `${context.payload.number}`);
+  }
   expect(commitExecArgs).toEqual(expectedArgs);
   expect(commitCommand).toEqual('create-commit');
 });