fix: mobile regex

ExodusMovement · Aug 24, 2022 · 2f1cf2b · 2f1cf2b
1 parent 26c1168
commit 2f1cf2b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/asana-actions-workflow.js b/asana-actions-workflow.js
@@ -3,8 +3,10 @@ const createUtils = require('./utils')
 const ACTION_CLOSE_PREFIX = 'CLOSE'
 const ACTION_MOVE_TO_SECTION_PREFIX = 'MOVE_TO_SECTION'
 const ASANA_MILESTONE_FIELD_NAME = 'Target Release Version'
-const GITHUB_MILESTONE_REGEX = '[x.0-9]*$'
-const ASANA_MILESTONE_REGEX = '[x.0-9]*$'
+const GITHUB_MILESTONE_REGEX = '[0-9].*'
+const ASANA_MILESTONE_REGEX = '[0-9].*'
+
+const RUNNING_TESTS = process.env.NODE_ENV === 'test'
 
 module.exports = async (core, github) => {
   const githubToken = core.getInput('github_token')
@@ -164,7 +166,7 @@ module.exports = async (core, github) => {
     core.info(`${JSON.stringify(milestone)}, ${action}`)
 
     const milestoneId = isMilestoned ? milestone.title : null // demilestoned still hold the old value for milestone.
-    if (isMilestoned) {
+    if (isMilestoned && !RUNNING_TESTS) {
       // Changing from milestone X to Y triggers demilestoned and milestone at the same time
       // And it sometimes end up setting it first and then cleaning it up.
       await new Promise((resolve) => setTimeout(resolve, 15000))

diff --git a/tests/index.test.js b/tests/index.test.js
@@ -87,8 +87,7 @@ describe('Asana Actions Workflow', () => {
     await createAsanaActionsWorkflow(core, createGithub(1307))
   })
 
-  // TODO: inspect regexp
-  // it('Should update task milestone with v21.08.20-genesis', async () => {
-  //   await createAsanaActionsWorkflow(core, createGithub(1302))
-  // })
+  it('Should update task milestone with v21.08.20-genesis', async () => {
+    await createAsanaActionsWorkflow(core, createGithub(1302))
+  })
 })
diff --git a/tests/unit.test.js b/tests/unit.test.js
@@ -1,8 +1,8 @@
 const createUtils = require('../utils')
 const core = require('./github-core')
 
-const githubMilestoneRegex = RegExp('[0-9x.]*$', 'i')
-const asanaMilestoneRegex = RegExp('[0-9x.]*$', 'i')
+const githubMilestoneRegex = RegExp('[0-9].*', 'i')
+const asanaMilestoneRegex = RegExp('[0-9].*', 'i')
 
 const utils = createUtils()
 
@@ -254,33 +254,36 @@ describe('Unit tests for getting field value', () => {
     expect(fieldValue.gid).toBe('5678')
   })
 
-  // TODO: couldn't find regexp for this :(
-  // it('Should return field value for V08.20.1-genesis', () => {
-  //   const milestone = 'V08.20.1-genesis'
-  //   const field = {
-  //     enum_options: [
-  //       {
-  //         gid: '1234',
-  //         name: 'v07.20',
-  //       },
-  //       {
-  //         gid: '5678',
-  //         name: 'v08.20.1',
-  //       },
-  //       {
-  //         gid: '9012',
-  //         name: 'v08.30',
-  //       },
-  //     ],
-  //   }
-  //   const fieldValue = utils.getTaskFieldValue({
-  //     field,
-  //     milestone,
-  //     githubMilestoneRegex,
-  //     asanaMilestoneRegex,
-  //   })
-  //   expect(fieldValue.gid).toBe('5678')
-  // })
+  it('Should return field value for V08.20.1-genesis', () => {
+    const milestone = 'V08.20.1-genesis'
+    const field = {
+      enum_options: [
+        {
+          gid: '1234',
+          name: 'v07.20',
+        },
+        {
+          gid: '5678',
+          name: 'v08.20.1',
+        },
+        {
+          gid: '5678',
+          name: 'v08.20.1-genesis',
+        },
+        {
+          gid: '9012',
+          name: 'v08.30',
+        },
+      ],
+    }
+    const fieldValue = utils.getTaskFieldValue({
+      field,
+      milestone,
+      githubMilestoneRegex,
+      asanaMilestoneRegex,
+    })
+    expect(fieldValue.gid).toBe('5678')
+  })
 
   it('Should return field value for V08.30.1x', () => {
     const milestone = 'V08.30.1x'