Skip to content
Permalink
Browse files

Simplify logic.

  • Loading branch information...
markstory committed Jul 7, 2017
1 parent 938fba0 commit 0b675b4b0efa37df30de34a264203483c9ccb953
Showing with 10 additions and 12 deletions.
  1. +1 −3 src/Console/ConsoleIo.php
  2. +9 −9 tests/TestCase/Console/ConsoleIoTest.php
@@ -209,9 +209,7 @@ public function overwrite($message, $newlines = 1, $size = null)
// Store length of content + fill so if the new content
// is shorter than the old content the next overwrite
// will work.
if ($fill > 0) {
$this->_lastWritten = $newBytes + $fill;
}
$this->_lastWritten = $newBytes + $fill;
}
/**
@@ -339,18 +339,18 @@ public function testOverwrite()
*/
public function testOverwriteShorterContent()
{
$number = strlen('12345');
$length = strlen('12345');
$this->out->expects($this->at(0))
->method('write')
->with('12345')
->will($this->returnValue($number));
->will($this->returnValue($length));
// Backspaces
$this->out->expects($this->at(1))
->method('write')
->with(str_repeat("\x08", $number), 0)
->will($this->returnValue($number));
->with(str_repeat("\x08", $length), 0)
->will($this->returnValue($length));
$this->out->expects($this->at(2))
->method('write')
@@ -360,14 +360,14 @@ public function testOverwriteShorterContent()
// 2 spaces output to pad up to 5 bytes
$this->out->expects($this->at(3))
->method('write')
->with(str_repeat(' ', $number - 3), 0)
->will($this->returnValue($number - 3));
->with(str_repeat(' ', $length - 3), 0)
->will($this->returnValue($length - 3));
// Backspaces
$this->out->expects($this->at(4))
->method('write')
->with(str_repeat("\x08", $number), 0)
->will($this->returnValue($number));
->with(str_repeat("\x08", $length), 0)
->will($this->returnValue($length));
$this->out->expects($this->at(5))
->method('write')
@@ -376,7 +376,7 @@ public function testOverwriteShorterContent()
$this->out->expects($this->at(6))
->method('write')
->with(str_repeat(' ', $number - 2), 0);
->with(str_repeat(' ', $length - 2), 0);
$this->io->out('12345');
$this->io->overwrite('123', 0);

0 comments on commit 0b675b4

Please sign in to comment.
You can’t perform that action at this time.