Merge pull request #65 from reload/handle-empty-watchers

Handle empty watchers
reload · Feb 21, 2024 · 1dc20bb · 1dc20bb
2 parents 4f9dab1 + 96073c6
commit 1dc20bb
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/src/JiraSecurityIssue.php b/src/JiraSecurityIssue.php
@@ -83,7 +83,7 @@ public function __construct()
         $watchers = \getenv('JIRA_WATCHERS');
 
         if ($watchers) {
-            $this->watchers = \explode(',', $watchers);
+            $this->watchers = \array_filter(\explode(',', \trim($watchers)));
         }
 
         $conf = [

diff --git a/tests/JiraSecurityIssueTest.php b/tests/JiraSecurityIssueTest.php
@@ -365,6 +365,50 @@ public function testWatcherNotFound(): void
             ->ensure();
     }
 
+    public function testEmptyWatcher(): void
+    {
+        \putenv('JIRA_WATCHERS= ');
+
+        $issue = $this->newIssue();
+
+        $this->issueService
+            ->addComment(Argument::any(), Argument::any())
+            ->willReturn(new Comment());
+
+        $this->issueService
+            ->create(Argument::any())
+            ->will(static function () {
+                $issue = new Issue();
+                $issue->key = 'ABC-17';
+
+                return $issue;
+            });
+
+        $this->userService
+            ->findAssignableUsers([
+                'query' => ' ',
+                'project' => 'ABC',
+                'maxResults' => 1,
+            ])
+            ->willReturn([new User(['accountId' => 'abcd', 'displayName' => 'efgh'])]);
+
+        $this->issueService
+            ->addComment(
+                'ABC-17',
+                $issue->createComment(
+                    "No watchers on this issue, remember to notify relevant people.",
+                ),
+            )
+            ->shouldBeCalled();
+
+        $this->issueService->addWatcher(Argument::any(), Argument::any())->shouldNotBeCalled();
+
+        $issue
+            ->setTitle('The title')
+            ->setBody('Lala')
+            ->ensure();
+    }
+
     /**
      * Create a new, properly mocked, JiraSecurityIssue.
      */