diff --git a/tests/Command/PullRequest/PullRequestMergeCommandTest.php b/tests/Command/PullRequest/PullRequestMergeCommandTest.php index aef6b1a2..663cee7e 100644 --- a/tests/Command/PullRequest/PullRequestMergeCommandTest.php +++ b/tests/Command/PullRequest/PullRequestMergeCommandTest.php @@ -14,6 +14,7 @@ use Gush\Command\PullRequest\PullRequestMergeCommand; use Gush\Exception\UserException; use Gush\Operation\RemoteMergeOperation; +use Gush\Template\Pats\Pats; use Gush\Tests\Command\CommandTestCase; use Prophecy\Argument; use Symfony\Component\Console\Helper\HelperSet; @@ -153,7 +154,7 @@ function (HelperSet $helperSet) { ); $tester->execute( - ['pr_number' => 10], + ['pr_number' => 10, '--pat' => 'none'], ['interactive' => false] ); @@ -184,7 +185,7 @@ function (HelperSet $helperSet) { ); $tester->execute( - ['pr_number' => 10, '--no-comments' => true], + ['pr_number' => 10, '--no-comments' => true, '--pat' => 'none'], ['interactive' => false] ); @@ -251,7 +252,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 +276,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 +305,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 +344,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] );