Bugfix with auto label

Author: Nyholm

src/Subscriber/AutoUpdateTitleWithLabelSubscriber.php

@@ -50,9 +50,12 @@ public function onPullRequest(GitHubEvent $event)
         $lock = $this->lockFactory->createLock($repository->getFullName().'#'.$number);
         $lock->acquire(true); // blocking. Lock will be released at __destruct
 
-        $originalTitle = $prTitle = trim($data['pull_request']['title']);
+        // Fetch the current PR just to make sure it has not changed
+        $githubPullRequest = $this->pullRequestApi->show($repository, $number);
+        $originalTitle = $prTitle = trim($githubPullRequest['title']);
         $validLabels = [];
-        foreach ($data['pull_request']['labels'] as $label) {
+
+        foreach ($githubPullRequest['labels'] ?? [] as $label) {
             if ('dddddd' === strtolower($label['color'])) {
                 $validLabels[] = $label['name'];
                 // Remove label name from title
@@ -82,11 +85,6 @@ public function onPullRequest(GitHubEvent $event)
             return;
         }
 
-        // Refetch the current title just to make sure it has not changed
-        if ($prTitle === ($this->pullRequestApi->show($repository, $number)['title'] ?? '')) {
-            return;
-        }
-
         $this->pullRequestApi->updateTitle($repository, $number, $prTitle);
         $event->setResponseData([
             'pull_request' => $number,

tests/Subscriber/AutoUpdateTitleWithLabelSubscriberTest.php

@@ -45,17 +45,14 @@ protected function setUp()
 
     public function testOnPullRequestLabeled()
     {
-        $event = new GitHubEvent([
-            'action' => 'labeled',
-            'number' => 1234,
-            'pull_request' => [
-                'title' => '[fwb][bar] Foo',
-                'labels' => [
-                    ['name' => 'FrameworkBundle', 'color' => 'dddddd'],
-                    ['name' => 'Console', 'color' => 'dddddd'],
-                ],
+        $event = new GitHubEvent(['action' => 'labeled', 'number' => 1234, 'pull_request'=>[]], $this->repository);
+        $this->pullRequestApi->method('show')->willReturn([
+            'title' => '[fwb][bar] Foo',
+            'labels' => [
+                ['name' => 'FrameworkBundle', 'color' => 'dddddd'],
+                ['name' => 'Console', 'color' => 'dddddd'],
             ],
-        ], $this->repository);
+        ]);
 
         $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
         $responseData = $event->getResponseData();
@@ -67,16 +64,13 @@ public function testOnPullRequestLabeled()
 
     public function testOnPullRequestLabeledCaseInsensitive()
     {
-        $event = new GitHubEvent([
-            'action' => 'labeled',
-            'number' => 1234,
-            'pull_request' => [
-                'title' => '[PHPunitbridge] Foo',
-                'labels' => [
-                    ['name' => 'PhpUnitBridge', 'color' => 'dddddd'],
-                ],
+        $event = new GitHubEvent(['action' => 'labeled', 'number' => 1234, 'pull_request'=>[]], $this->repository);
+        $this->pullRequestApi->method('show')->willReturn([
+            'title' => '[PHPunitbridge] Foo',
+            'labels' => [
+                ['name' => 'PhpUnitBridge', 'color' => 'dddddd'],
             ],
-        ], $this->repository);
+        ]);
 
         $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
         $responseData = $event->getResponseData();
@@ -88,42 +82,14 @@ public function testOnPullRequestLabeledCaseInsensitive()
 
     public function testOnPullRequestLabeledWithExisting()
     {
-        $event = new GitHubEvent([
-            'action' => 'labeled',
-            'number' => 1234,
-            'pull_request' => [
+        $event = new GitHubEvent(['action' => 'labeled', 'number' => 1234, 'pull_request'=>[]], $this->repository);
+        $this->pullRequestApi->method('show')->willReturn([
                 'title' => '[Messenger] Fix JSON',
                 'labels' => [
                     ['name' => 'Status: Needs Review', 'color' => 'abcabc'],
                     ['name' => 'Messenger', 'color' => 'dddddd'],
                 ],
-            ],
-        ], $this->repository);
-
-        $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
-        $responseData = $event->getResponseData();
-        $this->assertEmpty($responseData);
-    }
-
-    /**
-     * If a user add two labels at the same time. We will get two webhooks simultaneously.
-     * We need to make sure that when we request the Github API it will return the changes
-     * from the first webhook.
-     */
-    public function testOnPullRequestLabeledTwice()
-    {
-        $this->pullRequestApi->method('show')->willReturn(['title' => '[Console][FrameworkBundle] Foo normal title']);
-        $event = new GitHubEvent([
-            'action' => 'labeled',
-            'number' => 1234,
-            'pull_request' => [
-                'title' => 'Foo normal title',
-                'labels' => [
-                    ['name' => 'FrameworkBundle', 'color' => 'dddddd'],
-                    ['name' => 'Console', 'color' => 'dddddd'],
-                ],
-            ],
-        ], $this->repository);
+            ]);
 
         $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
         $responseData = $event->getResponseData();
@@ -132,16 +98,13 @@ public function testOnPullRequestLabeledTwice()
 
     public function testRemoveLabel()
     {
-        $event = new GitHubEvent([
-            'action' => 'labeled',
-            'number' => 1234,
-            'pull_request' => [
+        $event = new GitHubEvent(['action' => 'labeled', 'number' => 1234, 'pull_request'=>[]], $this->repository);
+        $this->pullRequestApi->method('show')->willReturn([
                 'title' => '[Console][FrameworkBundle] [Random] Foo normal title',
                 'labels' => [
                     ['name' => 'Console', 'color' => 'dddddd'],
                 ],
-            ],
-        ], $this->repository);
+            ]);
 
         $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
         $responseData = $event->getResponseData();