From 91f1116e046818fb49a19ff59652f684c6f5f736 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 26 Mar 2016 12:37:27 -0700 Subject: [ticket/14561] User activate command PHPBB3-14561 --- tests/console/user/activate_test.php | 124 +++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 tests/console/user/activate_test.php (limited to 'tests/console/user/activate_test.php') diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php new file mode 100644 index 0000000000..90a4d74a26 --- /dev/null +++ b/tests/console/user/activate_test.php @@ -0,0 +1,124 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Tester\CommandTester; +use phpbb\console\command\user\activate; + +class phpbb_console_command_user_activate_test extends phpbb_database_test_case +{ + protected $db; + protected $config; + protected $user; + protected $language; + protected $log; + protected $notifications; + protected $command_name; + protected $phpbb_root_path; + protected $php_ext; + + public function getDataSet() + { + return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); + } + + public function setUp() + { + global $config, $db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx; + + $auth = $this->getMock('\phpbb\auth\auth'); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + $config = $this->config = new \phpbb\config\config(array()); + + $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( + $this->language, + '\phpbb\datetime' + )); + + $this->log = $this->getMockBuilder('\phpbb\log\log') + ->disableOriginalConstructor() + ->getMock(); + + $this->notifications = $this->getMockBuilder('\phpbb\notification\manager') + ->disableOriginalConstructor() + ->getMock(); + + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + + parent::setUp(); + } + + public function activate_test_data() + { + return array( + // Test an inactive user + array('Test', false, 'USER_ADMIN_ACTIVATED'), + array('Test', true, 'CLI_DESCRIPTION_USER_ACTIVATE_INACTIVE'), + + // Test an active user + array('Test 2', false, 'CLI_DESCRIPTION_USER_ACTIVATE_ACTIVE'), + array('Test 2', true, 'USER_ADMIN_DEACTIVED'), + + // Test a non existent user + array('Foo', false, 'NO_USER'), + array('Foo', true, 'NO_USER'), + ); + } + + /** + * @dataProvider activate_test_data + */ + public function test_activate($username, $deactivate, $expected) + { + $command_tester = $this->get_command_tester(); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'username' => $username, + '--deactivate' => $deactivate, + )); + + $this->assertContains($expected, $command_tester->getDisplay()); + } + + public function get_command_tester() + { + $application = new Application(); + $application->add(new activate( + $this->user, + $this->db, + $this->config, + $this->language, + $this->log, + $this->notifications, + $this->phpbb_root_path, + $this->php_ext + )); + + $command = $application->find('user:activate'); + $this->command_name = $command->getName(); + + return new CommandTester($command); + } +} -- cgit v1.2.1 From 6291bfaca94d104f1c85a0b139cab908e0793b3a Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 26 Mar 2016 12:59:23 -0700 Subject: [ticket/14561] Refactor tests PHPBB3-14561 --- tests/console/user/activate_test.php | 81 ++++++++++-------------------------- 1 file changed, 21 insertions(+), 60 deletions(-) (limited to 'tests/console/user/activate_test.php') diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 90a4d74a26..08b25c6c95 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -15,58 +15,39 @@ use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\user\activate; -class phpbb_console_command_user_activate_test extends phpbb_database_test_case +require_once dirname(__FILE__) . '/base.php'; + +class phpbb_console_user_activate_test extends phpbb_console_user_base { - protected $db; - protected $config; - protected $user; - protected $language; - protected $log; protected $notifications; - protected $command_name; - protected $phpbb_root_path; - protected $php_ext; - - public function getDataSet() - { - return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); - } public function setUp() { - global $config, $db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx; - - $auth = $this->getMock('\phpbb\auth\auth'); - - $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - - $config = $this->config = new \phpbb\config\config(array()); - - $db = $this->db = $this->new_dbal(); + parent::setUp(); - $this->language = $this->getMockBuilder('\phpbb\language\language') + $this->notifications = $this->getMockBuilder('\phpbb\notification\manager') ->disableOriginalConstructor() ->getMock(); - $this->language->expects($this->any()) - ->method('lang') - ->will($this->returnArgument(0)); - $user = $this->user = $this->getMock('\phpbb\user', array(), array( + } + + public function get_command_tester() + { + $application = new Application(); + $application->add(new activate( + $this->user, + $this->db, + $this->config, $this->language, - '\phpbb\datetime' + $this->log, + $this->notifications, + $this->phpbb_root_path, + $this->php_ext )); - $this->log = $this->getMockBuilder('\phpbb\log\log') - ->disableOriginalConstructor() - ->getMock(); - - $this->notifications = $this->getMockBuilder('\phpbb\notification\manager') - ->disableOriginalConstructor() - ->getMock(); - - $this->phpbb_root_path = $phpbb_root_path; - $this->php_ext = $phpEx; + $command = $application->find('user:activate'); + $this->command_name = $command->getName(); - parent::setUp(); + return new CommandTester($command); } public function activate_test_data() @@ -101,24 +82,4 @@ class phpbb_console_command_user_activate_test extends phpbb_database_test_case $this->assertContains($expected, $command_tester->getDisplay()); } - - public function get_command_tester() - { - $application = new Application(); - $application->add(new activate( - $this->user, - $this->db, - $this->config, - $this->language, - $this->log, - $this->notifications, - $this->phpbb_root_path, - $this->php_ext - )); - - $command = $application->find('user:activate'); - $this->command_name = $command->getName(); - - return new CommandTester($command); - } } -- cgit v1.2.1 From 4b789c041844396f3a5e6a51142c45c13d2edd59 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 27 Mar 2016 10:24:12 -0700 Subject: [ticket/14561] Use the user loader where appropriate PHPBB3-14561 --- tests/console/user/activate_test.php | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/console/user/activate_test.php') diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 08b25c6c95..1588a76e47 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -40,6 +40,7 @@ class phpbb_console_user_activate_test extends phpbb_console_user_base $this->language, $this->log, $this->notifications, + $this->user_loader, $this->phpbb_root_path, $this->php_ext )); -- cgit v1.2.1