Merge branch 'master' of github.com:mergeability/mergeable

Author: AlberTajuelo

__tests__/unit/actions/lib/searchAndReplaceSpecialAnnotation.test.js

@@ -36,4 +36,22 @@ describe('searchAndReplaceSpecialAnnotations', () => {
     }
     expect(searchAndReplaceSpecialAnnotations('this is @author', payload)).toBe('this is creator')
   })
+
+  test('@@author is replaced by @payload.user.login', () => {
+    const payload = {
+      user: {
+        login: 'creator'
+      }
+    }
+    expect(searchAndReplaceSpecialAnnotations('this is @@author', payload)).toBe('this is @creator')
+  })
+
+  test('replaces annotation anywhere in the text', () => {
+    const payload = {
+      user: {
+        login: 'creator'
+      }
+    }
+    expect(searchAndReplaceSpecialAnnotations('this is something@author speaking', payload)).toBe('this is somethingcreator speaking')
+  })
 })

docs/changelog.rst

@@ -1,5 +1,6 @@
 CHANGELOG
 =====================================
+| Feb 27, 2024: fix: search and replace of special annotations `#735 <https://github.com/mergeability/mergeable/pull/735>`_
 | May 12, 2023: fix: Loading teams for team option of author filter/validator `#713 <https://github.com/mergeability/mergeable/pull/713>`_
 | May 11, 2023: fix: Send correct payload for changing labels `#715 <https://github.com/mergeability/mergeable/pull/715>`_
 | April 25, 2023: feat: Add author validator `#710 <https://github.com/mergeability/mergeable/pull/710>`_

docs/recipes.rst

@@ -212,22 +212,17 @@ Checks that the PR's draft state is false before running actions.
     mergeable:
       - when: pull_request.*, pull_request_review.*
         name: 'Draft check'
-        validate:
+        filter:
           - do: payload
             pull_request:
               draft:
                 boolean:
                   match: false
-        pass:
-          - do: comment
-            payload:
-              body: This PR is NOT a draft!
-        fail:
-          - do: comment
-            payload:
-              body: This PR is STILL a draft!
-
-
+        validate:
+          - do: description
+            no_empty:
+              enabled: true
+              message: Description must be present when PR is not a draft
 
 
 Allow commits only if they contain a Issue ID (like an Azure DevOps Work Item)

lib/actions/lib/searchAndReplaceSpecialAnnotation.js

@@ -6,11 +6,11 @@ const searchAndReplaceSpecialAnnotations = (template, payload) => {
   let newTemplate = template
 
   for (const annotation of Object.keys(SPECIAL_ANNOTATION)) {
-    const specialAnnotationRegex = new RegExp(`([^\\\\])${annotation}`)
+    const specialAnnotationRegex = new RegExp(`(?<!\\\\)${annotation}`)
     const annotationAtStartRegex = new RegExp(`^${annotation}`)
     const escapeAnnotationRegex = new RegExp(`(\\\\){1}${annotation}`)
 
-    newTemplate = newTemplate.replace(specialAnnotationRegex, ` ${SPECIAL_ANNOTATION[annotation](payload)}`)
+    newTemplate = newTemplate.replace(specialAnnotationRegex, `${SPECIAL_ANNOTATION[annotation](payload)}`)
     newTemplate = newTemplate.replace(escapeAnnotationRegex, annotation)
     newTemplate = newTemplate.replace(annotationAtStartRegex, SPECIAL_ANNOTATION[annotation](payload))
   }