Merge pull request #4 from onrunning/B2C-8964-fix-exception-regex

B2C-8964 - Fix exceptionRegex not tested against branch name
onrunning · Jun 21, 2022 · 000b679 · 000b679
2 parents 7d79864 + e86af85
commit 000b679
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -326,10 +326,9 @@ describe('#pull-request', () => {
         beforeAll(async () => {
           jest.resetModules()
           jest.resetAllMocks()
-          ticket = 'A1C-1234'
           preview = 'preview-123'
           const options = {
-            branch: `${ticket}-some-feature`,
+            branch: 'dependabot/npm_and_yarn/swiper-8.2.4',
             preview,
             updateStatus: HTTP_STATUS_SUCCESS,
           }
@@ -342,13 +341,10 @@ describe('#pull-request', () => {
           expect(errorSpy).not.toHaveBeenCalled()
         })
 
-        it('updates PR title and description', () => {
+        it('updates PR description with preview link only', () => {
           expect(prUpdateSpy).toHaveBeenCalledWith({
             ...DEFAULT_REQUEST_OPTIONS,
-            title: `${ticket} - title`,
-            body:
-              `**[Preview](${preview})**\n` +
-              `**[Jira ticket](https://account.atlassian.net/browse/${ticket})**\n\nbody`,
+            body: `**[Preview](${preview})**\n\nbody`,
           })
         })
       })

diff --git a/src/index.ts b/src/index.ts
@@ -74,7 +74,7 @@ async function run(): Promise<void> {
 
       if (!ticketRegex.test(prTitle)) request.title = `${ticketInBranch} - ${prTitle}`
     } else {
-      const isException = new RegExp(exceptionRegex, exceptionRegexFlags).test(ticketInBranch)
+      const isException = new RegExp(exceptionRegex, exceptionRegexFlags).test(headBranch)
 
       if (!isException) {
         const regexStr = ticketRegex.toString()