public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Update tests to handle optional QuestionHelper::setInputStream() availability

pull/6788/head
Gawain Lynch 2017-11-06 16:32:29 +01:00
parent f96e0e033b
commit f74c6f4620
No known key found for this signature in database
GPG Key ID: 508C10F858FD246E
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Composer/Test/IO/ConsoleIOTest.php
View File

@ -249,11 +249,6 @@ class ConsoleIOTest extends TestCase
->will($this->returnValue($helperMock)) ->will($this->returnValue($helperMock))
; ;
$inputMock->expects($this->once())
->method('isInteractive')
->will($this->returnValue(true))
;
$consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock); $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
$consoleIO->select('Select item', array("item1", "item2"), null, false, "Error message", true); $consoleIO->select('Select item', array("item1", "item2"), null, false, "Error message", true);
} }

43
tests/Composer/Test/Question/StrictConfirmationQuestionTest.php
View File

@ -16,6 +16,8 @@ use Composer\Question\StrictConfirmationQuestion;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Symfony\Component\Console\Exception\InvalidArgumentException; use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\StreamableInputInterface;
use Symfony\Component\Console\Output\StreamOutput; use Symfony\Component\Console\Output\StreamOutput;
/** /**
@ -42,11 +44,11 @@ class StrictConfirmationQuestionTest extends TestCase
*/ */
public function testAskConfirmationBadAnswer($answer) public function testAskConfirmationBadAnswer($answer)
{ {
$dialog = new QuestionHelper(); list($input, $dialog) = $this->createInput($answer."\n");
$dialog->setInputStream($this->getInputStream($answer."\n"));
$question = new StrictConfirmationQuestion('Do you like French fries?'); $question = new StrictConfirmationQuestion('Do you like French fries?');
$question->setMaxAttempts(1); $question->setMaxAttempts(1);
$dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question); $dialog->ask($input, $this->createOutputInterface(), $question);
} }
/** /**
@ -54,11 +56,10 @@ class StrictConfirmationQuestionTest extends TestCase
*/ */
public function testAskConfirmation($question, $expected, $default = true) public function testAskConfirmation($question, $expected, $default = true)
{ {
$dialog = new QuestionHelper(); list($input, $dialog) = $this->createInput($question."\n");
$dialog->setInputStream($this->getInputStream($question."\n"));
$question = new StrictConfirmationQuestion('Do you like French fries?', $default); $question = new StrictConfirmationQuestion('Do you like French fries?', $default);
$this->assertEquals($expected, $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel')); $this->assertEquals($expected, $dialog->ask($input, $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));
} }
public function getAskConfirmationData() public function getAskConfirmationData()
@ -75,13 +76,13 @@ class StrictConfirmationQuestionTest extends TestCase
public function testAskConfirmationWithCustomTrueAndFalseAnswer() public function testAskConfirmationWithCustomTrueAndFalseAnswer()
{ {
$dialog = new QuestionHelper();
$question = new StrictConfirmationQuestion('Do you like French fries?', false, '/^ja$/i', '/^nein$/i'); $question = new StrictConfirmationQuestion('Do you like French fries?', false, '/^ja$/i', '/^nein$/i');
$dialog->setInputStream($this->getInputStream("ja\n"));
$this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question)); list($input, $dialog) = $this->createInput("ja\n");
$dialog->setInputStream($this->getInputStream("nein\n")); $this->assertTrue($dialog->ask($input, $this->createOutputInterface(), $question));
$this->assertFalse($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
list($input, $dialog) = $this->createInput("nein\n");
$this->assertFalse($dialog->ask($input, $this->createOutputInterface(), $question));
} }
protected function getInputStream($input) protected function getInputStream($input)
@ -98,13 +99,19 @@ class StrictConfirmationQuestionTest extends TestCase
return new StreamOutput(fopen('php://memory', 'r+', false)); return new StreamOutput(fopen('php://memory', 'r+', false));
} }
protected function createInputInterfaceMock($interactive = true) protected function createInput($entry)
{ {
$mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(); $stream = $this->getInputStream($entry);
$mock->expects($this->any()) $input = new ArrayInput(array('--no-interaction'));
->method('isInteractive') $dialog = new QuestionHelper();
->will($this->returnValue($interactive));
return $mock; if (method_exists($dialog, 'setInputStream')) {
$dialog->setInputStream($stream);
}
if ($input instanceof StreamableInputInterface) {
$input->setStream($stream);
}
return array($input, $dialog);
} }
} }