control flow improvements for unlock-on-merge

Author: GrantBirki

__tests__/functions/unlock-on-merge.test.js

@@ -68,6 +68,20 @@ test('successfully unlocks all environments on a pull request merge', async () =
   )
 })
 
+test('finds that no deployment lock is set so none are removed', async () => {
+  jest.spyOn(unlock, 'unlock').mockImplementation(() => {
+    return 'no deployment lock currently set - silent'
+  })
+
+  expect(
+    await unlockOnMerge(octokit, context, environment_targets)
+  ).toStrictEqual(true)
+  expect(debugMock).toHaveBeenCalledWith(
+    'unlock result for unlock-on-merge: no deployment lock currently set - silent'
+  )
+  expect(setOutputMock).toHaveBeenCalledWith('unlocked_environments', '')
+})
+
 test('only unlocks one environment because the other has no lock and the other is not associated with the pull request', async () => {
   checkLockFile.checkLockFile.mockImplementationOnce(() => {
     return {

dist/index.js

@@ -53,6 +53,8 @@ export async function unlockOnMerge(octokit, context, environment_targets) {
         // if the result is 'removed lock - silent', then the lock was successfully removed - append to the array for later use
         if (result === 'removed lock - silent') {
           releasedEnvironments.push(environment)
+        } else {
+          core.debug(`unlock result for unlock-on-merge: ${result}`)
         }
 
         // log the result and format the output as it will always be a string ending with '- silent'
@@ -70,7 +72,7 @@ export async function unlockOnMerge(octokit, context, environment_targets) {
     }
   }
 
-  // if we get here, all locks were made a best effort to be released
+  // if we get here, all locks had a best effort attempt to be released
   core.setOutput('unlocked_environments', releasedEnvironments.join(','))
   return true
 }