Merge pull request #28 from WouterJ/remove_unconfirmed

Remove unconfirmed label when bug was reviewed

Author: weaverryan

src/AppBundle/Issues/GitHub/GitHubStatusApi.php

@@ -54,8 +54,12 @@ public function setIssueStatus($issueNumber, $newStatus)
         $addLabel = true;
 
         foreach ($currentLabels as $label) {
-            // Ignore non-status
-            if (!isset($this->labelToStatus[$label])) {
+            // Ignore non-status, except when the bug is reviewed
+            // but still marked as unconfirmed.
+            if (
+                !isset($this->labelToStatus[$label])
+                && !(Status::REVIEWED === $newStatus && 'Unconfirmed' === $label)
+            ) {
                 continue;
             }
 

src/AppBundle/Tests/Issues/GitHub/GitHubStatusApiTest.php

@@ -123,6 +123,28 @@ public function testSetIssueStatusRemovesExcessLabelsIfAlreadySet()
         $this->api->setIssueStatus(1234, Status::REVIEWED);
     }
 
+    public function testSetIssueStatusRemovesUnconfirmedWhenBugIsReviewed()
+    {
+        $this->labelsApi->expects($this->once())
+            ->method('getIssueLabels')
+            ->with(1234)
+            ->willReturn(array('Bug', 'Status: Needs Review', 'Unconfirmed'));
+
+        $this->labelsApi->expects($this->at(1))
+            ->method('removeIssueLabel')
+            ->with(1234, 'Status: Needs Review');
+
+        $this->labelsApi->expects($this->at(2))
+            ->method('removeIssueLabel')
+            ->with(1234, 'Unconfirmed');
+
+        $this->labelsApi->expects($this->once())
+            ->method('addIssueLabel')
+            ->with(1234, 'Status: Reviewed');
+
+        $this->api->setIssueStatus(1234, Status::REVIEWED);
+    }
+
     public function testGetIssueStatus()
     {
         $this->labelsApi->expects($this->once())