Update PullRequestMergeCommandTest in order to set explicitly `"pat…

…" => "none" for non interactive command executions
gushphp · May 18, 2018 · e00bcad · e00bcad
1 parent 0525ccf
commit e00bcad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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;