Skip to content

Commit e00bcad

Browse files
committed
Update PullRequestMergeCommandTest in order to set explicitly `"pat" => "none" for non interactive command executions
1 parent 0525ccf commit e00bcad

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

tests/Command/PullRequest/PullRequestMergeCommandTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function (HelperSet $helperSet) {
153153
);
154154

155155
$tester->execute(
156-
['pr_number' => 10],
156+
['pr_number' => 10, '--pat' => 'none'],
157157
['interactive' => false]
158158
);
159159

@@ -184,7 +184,7 @@ function (HelperSet $helperSet) {
184184
);
185185

186186
$tester->execute(
187-
['pr_number' => 10, '--no-comments' => true],
187+
['pr_number' => 10, '--no-comments' => true, '--pat' => 'none'],
188188
['interactive' => false]
189189
);
190190

@@ -251,7 +251,7 @@ function (HelperSet $helperSet) {
251251
);
252252

253253
$tester->execute(
254-
['pr_number' => 10, '--squash' => true, 'pr_type' => 'merge'],
254+
['pr_number' => 10, '--squash' => true, 'pr_type' => 'merge', '--pat' => 'none'],
255255
['interactive' => false]
256256
);
257257

@@ -275,7 +275,7 @@ function (HelperSet $helperSet) {
275275
);
276276

277277
$tester->execute(
278-
['pr_number' => 10, '--force-squash' => true, 'pr_type' => 'merge'],
278+
['pr_number' => 10, '--force-squash' => true, 'pr_type' => 'merge', '--pat' => 'none'],
279279
['interactive' => false]
280280
);
281281

@@ -304,7 +304,7 @@ function (HelperSet $helperSet) {
304304
);
305305

306306
$tester->execute(
307-
['pr_number' => 10, '--switch' => 'develop', 'pr_type' => 'merge'],
307+
['pr_number' => 10, '--switch' => 'develop', 'pr_type' => 'merge', '--pat' => 'none'],
308308
['interactive' => false]
309309
);
310310

@@ -343,7 +343,7 @@ function (HelperSet $helperSet) {
343343
);
344344

345345
$tester->execute(
346-
['pr_number' => 10, '--fast-forward' => true, 'pr_type' => 'merge'],
346+
['pr_number' => 10, '--fast-forward' => true, 'pr_type' => 'merge', '--pat' => 'none'],
347347
['interactive' => false]
348348
);
349349

tests/Command/PullRequest/PullRequestPatOnTheBackCommandTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,11 @@ private function getTemplateHelper($pat = 'good_job')
104104
->getMock()
105105
;
106106

107-
$template->expects($this->once())
107+
$template
108108
->method('bindAndRender')
109-
->with(['author' => 'weaverryan', 'pat' => $pat], 'pats', 'general')
110-
->will($this->returnValue(self::$pats[$pat]))
109+
->will($this->returnValueMap([[
110+
['author' => 'weaverryan', 'pat' => $pat], 'pats', 'general', self::$pats[$pat],
111+
]]))
111112
;
112113

113114
return $template;

0 commit comments

Comments
 (0)