[ticket/12684] Fix tests

iMattPro · iMattPro · commit fe31060fca4a · 2016-02-29T14:23:32.000-08:00
PHPBB3-12684
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
@@ -125,7 +125,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			$question->setValidator(function ($value) use ($self, $helper, $input, $output) {
 				$question = new Question($self->ask_user('CONFIRM_PASSWORD'));
 				$question->setHidden(true);
-				$question->setHiddenFallback(false);
 
 				$confirm = $helper->ask($input, $output, $question);
 				if ($confirm != $value)
@@ -135,7 +134,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 				return $value;
 			});
 			$question->setHidden(true);
-			$question->setHiddenFallback(false);
 			$question->setMaxAttempts(5);
 
 			$data['new_password'] = $helper->ask($input, $output, $question);
@@ -223,7 +221,7 @@ protected function validate_user_data($data)
 
 		if ($error)
 		{
-			throw new runtime_exception(implode("\n", array_map(array($this->user, 'lang'), $error)));
+			throw new runtime_exception(implode("\n", array_map(array($this->language, 'lang'), $error)));
 		}
 	}
 
diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php
@@ -24,9 +24,10 @@ class phpbb_console_command_user_add_test extends phpbb_database_test_case
 	protected $db;
 	protected $config;
 	protected $user;
+	protected $language;
 	protected $passwords_manager;
 	protected $command_name;
-	protected $dialog;
+	protected $question;
 	protected $phpbb_root_path;
 	protected $php_ext;
 
@@ -59,11 +60,16 @@ public function setUp()
 
 		$db = $this->db = $this->new_dbal();
 
+		$this->language = $this->getMockBuilder('\phpbb\language\language')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->language->expects($this->any())
+			->method('lang')
+			->will($this->returnArgument(0));
 		$user = $this->user = $this->getMock('\phpbb\user', array(), array(
-			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
-			'\phpbb\datetime')
-		);
-		$this->user->method('lang')->will($this->returnArgument(0));
+			$this->language,
+			'\phpbb\datetime'
+		));
 
 		$driver_helper = new \phpbb\passwords\driver\helper($this->config);
 		$passwords_drivers = array(
@@ -105,7 +111,7 @@ public function test_add_dialog()
 
 		$this->assertEquals(2, $this->get_user_id('Admin'));
 
-		$this->dialog->setInputStream($this->getInputStream("bar\npassword\npassword\nbar@test.com\n"));
+		$this->question->setInputStream($this->getInputStream("bar\npassword\npassword\nbar@test.com\n"));
 
 		$command_tester->execute(array(
 			'command'		=> $this->command_name,
@@ -137,11 +143,11 @@ public function test_add_no_dialog_invalid()
 	public function get_command_tester()
 	{
 		$application = new Application();
-		$application->add(new add($this->user, $this->db, $this->config, $this->passwords_manager, $this->phpbb_root_path, $this->php_ext));
+		$application->add(new add($this->user, $this->db, $this->config, $this->language, $this->passwords_manager, $this->phpbb_root_path, $this->php_ext));
 
 		$command = $application->find('user:add');
 		$this->command_name = $command->getName();
-		$this->dialog = $command->getHelper('dialog');
+		$this->question = $command->getHelper('question');
 		return new CommandTester($command);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`125`	`125`	`$question->setValidator(function ($value) use ($self, $helper, $input, $output) {`
`126`	`126`	`$question = new Question($self->ask_user('CONFIRM_PASSWORD'));`
`127`	`127`	`$question->setHidden(true);`
`128`		`- $question->setHiddenFallback(false);`
`129`	`128`
`130`	`129`	`$confirm = $helper->ask($input, $output, $question);`
`131`	`130`	`if ($confirm != $value)`
`@@ -135,7 +134,6 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`135`	`134`	`return $value;`
`136`	`135`	`});`
`137`	`136`	`$question->setHidden(true);`
`138`		`- $question->setHiddenFallback(false);`
`139`	`137`	`$question->setMaxAttempts(5);`
`140`	`138`
`141`	`139`	`$data['new_password'] = $helper->ask($input, $output, $question);`
`@@ -223,7 +221,7 @@ protected function validate_user_data($data)`
`223`	`221`
`224`	`222`	`if ($error)`
`225`	`223`	`{`
`226`		`- throw new runtime_exception(implode("\n", array_map(array($this->user, 'lang'), $error)));`
	`224`	`+ throw new runtime_exception(implode("\n", array_map(array($this->language, 'lang'), $error)));`
`227`	`225`	`}`
`228`	`226`	`}`
`229`	`227`