Fixing Shell tests to use ConsoleInput.

cakephp · Oct 14, 2010 · 7921ef1 · 7921ef1
1 parent e816a49
commit 7921ef1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
@@ -155,6 +155,13 @@ class Shell extends Object {
  */
 	public $stderr;
 
+/**
+ * stdin object
+ *
+ * @var ConsoleInput
+ */
+	public $stdin;
+
 /**
  *  Constructs this Shell instance.
  *

diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
@@ -110,7 +110,8 @@ public function setUp() {
 		);
 		$output = $this->getMock('ConsoleOutput');
 		$error = $this->getMock('ConsoleOutput');
-		$this->Shell =& new TestShell($this->Dispatcher, $output, $error);
+		$in = $this->getMock('ConsoleInput');
+		$this->Shell =& new TestShell($this->Dispatcher, $output, $error, $in);
 	}
 
 /**
@@ -174,29 +175,24 @@ public function testInitialize() {
  * @return void
  */
 	public function testIn() {
-		$this->Dispatcher->expects($this->at(0))
-			->method('getInput')
-			->with('Just a test?', array('y', 'n'), 'n')
+		$this->Shell->stdin->expects($this->at(0))
+			->method('read')
 			->will($this->returnValue('n'));
 
-		$this->Dispatcher->expects($this->at(1))
-			->method('getInput')
-			->with('Just a test?', array('y', 'n'), 'n')
+		$this->Shell->stdin->expects($this->at(1))
+			->method('read')
 			->will($this->returnValue('Y'));
 
-		$this->Dispatcher->expects($this->at(2))
-			->method('getInput')
-			->with('Just a test?', 'y,n', 'n')
+		$this->Shell->stdin->expects($this->at(2))
+			->method('read')
 			->will($this->returnValue('y'));
 
-		$this->Dispatcher->expects($this->at(3))
-			->method('getInput')
-			->with('Just a test?', 'y/n', 'n')
+		$this->Shell->stdin->expects($this->at(3))
+			->method('read')
 			->will($this->returnValue('y'));
 
-		$this->Dispatcher->expects($this->at(4))
-			->method('getInput')
-			->with('Just a test?', 'y', 'y')
+		$this->Shell->stdin->expects($this->at(4))
+			->method('read')
 			->will($this->returnValue('y'));
 
 		$result = $this->Shell->in('Just a test?', array('y', 'n'), 'n');
@@ -471,14 +467,12 @@ function testCreateFileInteractive() {
 
 		$this->Shell->interactive = true;
 
-		$this->Shell->Dispatch->expects($this->at(5))
-			->method('getInput')
-			->withAnyParameters()
+		$this->Shell->stdin->expects($this->at(0))
+			->method('read')
 			->will($this->returnValue('n'));
 
-		$this->Shell->Dispatch->expects($this->at(9))
-			->method('getInput')
-			->withAnyParameters()
+		$this->Shell->stdin->expects($this->at(1))
+			->method('read')
 			->will($this->returnValue('y'));