From e00bcad1141b419caa96dce8f2278578dde6b6db Mon Sep 17 00:00:00 2001
From: Javier Spagnoletti <phansys@gmail.com>
Date: Fri, 18 May 2018 00:21:08 -0300
Subject: [PATCH] Update `PullRequestMergeCommandTest` in order to set
 explicitly `"pat" => "none" for non interactive command executions

---
 .../PullRequest/PullRequestMergeCommandTest.php      | 12 ++++++------
 .../PullRequestPatOnTheBackCommandTest.php           |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/Command/PullRequest/PullRequestMergeCommandTest.php b/tests/Command/PullRequest/PullRequestMergeCommandTest.php
index aef6b1a2..2dbe9369 100644
--- a/tests/Command/PullRequest/PullRequestMergeCommandTest.php
+++ b/tests/Command/PullRequest/PullRequestMergeCommandTest.php
@@ -153,7 +153,7 @@ function (HelperSet $helperSet) {
         );
 
         $tester->execute(
-            ['pr_number' => 10],
+            ['pr_number' => 10, '--pat' => 'none'],
             ['interactive' => false]
         );
 
@@ -184,7 +184,7 @@ function (HelperSet $helperSet) {
         );
 
         $tester->execute(
-            ['pr_number' => 10, '--no-comments' => true],
+            ['pr_number' => 10, '--no-comments' => true, '--pat' => 'none'],
             ['interactive' => false]
         );
 
@@ -251,7 +251,7 @@ function (HelperSet $helperSet) {
         );
 
         $tester->execute(
-            ['pr_number' => 10, '--squash' => true, 'pr_type' => 'merge'],
+            ['pr_number' => 10, '--squash' => true, 'pr_type' => 'merge', '--pat' => 'none'],
             ['interactive' => false]
         );
 
@@ -275,7 +275,7 @@ function (HelperSet $helperSet) {
         );
 
         $tester->execute(
-            ['pr_number' => 10, '--force-squash' => true, 'pr_type' => 'merge'],
+            ['pr_number' => 10, '--force-squash' => true, 'pr_type' => 'merge', '--pat' => 'none'],
             ['interactive' => false]
         );
 
@@ -304,7 +304,7 @@ function (HelperSet $helperSet) {
         );
 
         $tester->execute(
-            ['pr_number' => 10, '--switch' => 'develop', 'pr_type' => 'merge'],
+            ['pr_number' => 10, '--switch' => 'develop', 'pr_type' => 'merge', '--pat' => 'none'],
             ['interactive' => false]
         );
 
@@ -343,7 +343,7 @@ function (HelperSet $helperSet) {
         );
 
         $tester->execute(
-            ['pr_number' => 10, '--fast-forward' => true, 'pr_type' => 'merge'],
+            ['pr_number' => 10, '--fast-forward' => true, 'pr_type' => 'merge', '--pat' => 'none'],
             ['interactive' => false]
         );
 
diff --git a/tests/Command/PullRequest/PullRequestPatOnTheBackCommandTest.php b/tests/Command/PullRequest/PullRequestPatOnTheBackCommandTest.php
index e2567cd6..ded92a87 100644
--- a/tests/Command/PullRequest/PullRequestPatOnTheBackCommandTest.php
+++ b/tests/Command/PullRequest/PullRequestPatOnTheBackCommandTest.php
@@ -104,10 +104,11 @@ private function getTemplateHelper($pat = 'good_job')
             ->getMock()
         ;
 
-        $template->expects($this->once())
+        $template
             ->method('bindAndRender')
-            ->with(['author' => 'weaverryan', 'pat' => $pat], 'pats', 'general')
-            ->will($this->returnValue(self::$pats[$pat]))
+            ->will($this->returnValueMap([[
+                ['author' => 'weaverryan', 'pat' => $pat], 'pats', 'general', self::$pats[$pat],
+            ]]))
         ;
 
         return $template;