fixing a test bug where we need to clean off labels before trying

Author: weaverryan

src/Issues/GitHub/GitHubStatusApi.php

@@ -36,16 +36,16 @@ public function __construct(CachedLabelsApi $labelsApi, LoggerInterface $logger)
 
     /**
      * @param int        $issueNumber The GitHub issue number
-     * @param string     $newStatus   A Status::* constant
+     * @param string|null $newStatus   A Status::* constant
      * @param Repository $repository
      */
     public function setIssueStatus($issueNumber, $newStatus, Repository $repository)
     {
-        if (!isset(self::$statusToLabel[$newStatus])) {
+        if (null !== $newStatus && !isset(self::$statusToLabel[$newStatus])) {
             throw new \InvalidArgumentException(sprintf('Invalid status "%s"', $newStatus));
         }
 
-        $newLabel = self::$statusToLabel[$newStatus];
+        $newLabel = $newStatus === null ? null : self::$statusToLabel[$newStatus];
         $this->logger->info(sprintf(
             'Fetching issue labels for issue %s, repository %s',
             $issueNumber,
@@ -86,7 +86,7 @@ public function setIssueStatus($issueNumber, $newStatus, Repository $repository)
         }
 
         // Ignored if the label is already set
-        if ($addLabel) {
+        if ($addLabel && $newLabel) {
             $this->logger->debug(sprintf(
                 'Adding label "%s" to issue %s on repository %s',
                 $newLabel,

tests/Controller/WebhookControllerTest.php

@@ -2,16 +2,38 @@
 
 namespace App\Tests\Controller;
 
+use App\Issues\StatusApi;
+use App\Repository\Provider\RepositoryProviderInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class WebhookControllerTest extends WebTestCase
 {
+    private $client;
+
+    public function setup()
+    {
+        if ($this->client) {
+            return;
+        }
+
+        $this->client = $this->createClient();
+        $repository = self::$container->get(RepositoryProviderInterface::class);
+        $statusApi = self::$container->get(StatusApi::class);
+
+        // the labels need to be off this issue for one test to pass
+        $statusApi->setIssueStatus(
+            5,
+            null,
+            $repository->getRepository('weaverryan/symfony')
+        );
+    }
+
     /**
      * @dataProvider getTests
      */
     public function testIssueComment($eventHeader, $payloadFilename, $expectedResponse)
     {
-        $client = $this->createClient();
+        $client = $this->client;
         $body = file_get_contents(__DIR__.'/../webhook_examples/'.$payloadFilename);
         $client->request('POST', '/webhooks/github', [], [], ['HTTP_X-Github-Event' => $eventHeader], $body);
         $response = $client->getResponse();
@@ -36,7 +58,7 @@ public function getTests()
                 'pull_request.opened.json',
                 ['pull_request' => 3, 'status_change' => 'needs_review', 'pr_labels' => ['Bug']],
             ],
-            'On issue labeled "bug"' => [
+            'On issue labeled bug' => [
                 'issues',
                 'issues.labeled.bug.json',
                 ['issue' => 5, 'status_change' => 'needs_review'],