Merge pull request #549 from sstok/539-pull-request-merge-reports-wro…

…ng-target-when-using-switch-option Fix PullRequestMerge shows wrong target with switch
gushphp · Mar 1, 2016 · 0ae54b1 · 0ae54b1
2 parents 1dbb8a9 + 5021b79
commit 0ae54b1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/Command/PullRequest/PullRequestMergeCommand.php b/src/Command/PullRequest/PullRequestMergeCommand.php
@@ -143,11 +143,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $gitConfigHelper->ensureRemoteExists($targetRemote, $targetRepository);
         $gitConfigHelper->ensureRemoteExists($sourceRemote, $sourceRepository);
 
+        if ($input->getOption('switch')) {
+            $targetLabel = sprintf('New-target: %s/%s (was "%s")', $targetRemote, $input->getOption('switch'), $targetBranch);
+        } else {
+            $targetLabel = sprintf('Target: %s/%s', $targetRemote, $targetBranch);
+        }
+
         $styleHelper->title(sprintf('Merging pull-request #%d - %s', $prNumber, $pr['title']));
         $styleHelper->text(
             [
                 sprintf('Source: %s/%s', $sourceRemote, $sourceBranch),
-                sprintf('Target: %s/%s', $targetRemote, $targetBranch),
+                $targetLabel,
             ]
         );
 

diff --git a/tests/Command/PullRequest/PullRequestMergeCommandTest.php b/tests/Command/PullRequest/PullRequestMergeCommandTest.php
@@ -72,6 +72,10 @@ class PullRequestMergeCommandTest extends CommandTestCase
 
     const COMMAND_DISPLAY = <<<OET
 This PR was merged into the base_ref branch.
+OET;
+
+    const COMMAND_DISPLAY_TARGET = <<<OET
+Target: gushphp/base_ref
 OET;
 
     const FAILURE_TYPE_DISPLAY = <<<OET
@@ -84,6 +88,10 @@ class PullRequestMergeCommandTest extends CommandTestCase
 
     const COMMAND_SWITCH_BASE = <<<OET
 This PR was submitted for the base_ref branch but it was merged into the %s branch instead (closes #10).
+OET;
+
+    const COMMAND_SWITCH_BASE_TARGET = <<<OET
+New-target: %s/%s (was "%s")
 OET;
 
     private $commits = [
@@ -128,7 +136,8 @@ function (HelperSet $helperSet) {
         );
 
         $display = $tester->getDisplay();
-        $this->assertCommandOutputMatches(self::COMMAND_DISPLAY, $display);
+
+        $this->assertCommandOutputMatches([self::COMMAND_DISPLAY, self::COMMAND_DISPLAY_TARGET], $display);
     }
 
     public function testMergePullRequestWithNoComments()
@@ -276,7 +285,14 @@ function (HelperSet $helperSet) {
         );
 
         $display = $tester->getDisplay();
-        $this->assertCommandOutputMatches(sprintf(self::COMMAND_SWITCH_BASE, 'develop'), $display);
+
+        $this->assertCommandOutputMatches(
+            [
+                sprintf(self::COMMAND_SWITCH_BASE_TARGET, 'gushphp', 'develop', 'base_ref'),
+                sprintf(self::COMMAND_SWITCH_BASE, 'develop')
+            ],
+            $display
+        );
     }
 
     public function testMergePullRequestWithFastForward()