Merge pull request #419 from badideasforsale/better-trigger-detection

Better trigger detection

Author: GrantBirki

__tests__/functions/trigger-check.test.js

@@ -34,6 +34,9 @@ test('checks a message and finds a global trigger', async () => {
   const body = 'I want to .deploy'
   const trigger = '.deploy'
   expect(await triggerCheck(body, trigger)).toBe(false)
+  expect(debugMock).toHaveBeenCalledWith(
+    `comment body does not start with trigger: ${color}.deploy${colorReset}`
+  )
 })
 
 test('checks a message and finds a trigger with an environment and a variable', async () => {
@@ -52,3 +55,27 @@ test('checks a message and does not find global trigger', async () => {
     `comment body does not start with trigger: ${color}.deploy${colorReset}`
   )
 })
+
+test('does not match when body starts with a longer command sharing prefix', async () => {
+  const body = '.deploy-two to prod'
+  const trigger = '.deploy'
+  expect(await triggerCheck(body, trigger)).toBe(false)
+  expect(debugMock).toHaveBeenCalledWith(
+    `comment body starts with trigger but is not complete: ${color}.deploy${colorReset}`
+  )
+})
+
+test('does not match when immediately followed by alphanumeric', async () => {
+  const body = '.deploy1'
+  const trigger = '.deploy'
+  expect(await triggerCheck(body, trigger)).toBe(false)
+  expect(debugMock).toHaveBeenCalledWith(
+    `comment body starts with trigger but is not complete: ${color}.deploy${colorReset}`
+  )
+})
+
+test('matches when followed by a newline (whitespace)', async () => {
+  const body = `.deploy\ndev`
+  const trigger = '.deploy'
+  expect(await triggerCheck(body, trigger)).toBe(true)
+})

dist/index.js

@@ -14,6 +14,15 @@ export async function triggerCheck(body, trigger) {
     return false
   }
 
+  // Ensure the trigger match is complete: either end-of-string or followed by whitespace
+  const nextChar = body[trigger.length]
+  if (nextChar && !/\s/.test(nextChar)) {
+    core.debug(
+      `comment body starts with trigger but is not complete: ${COLORS.highlight}${trigger}${COLORS.reset}`
+    )
+    return false
+  }
+
   core.info(
     `✅ comment body starts with trigger: ${COLORS.highlight}${trigger}${COLORS.reset}`
   )