aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-12-08 16:49:50 -0800
committerMatt Friedman <maf675@gmail.com>2016-12-08 16:49:50 -0800
commit6a5b99b12b1812202843613994480cc6caf93354 (patch)
tree444482e333cb6d05b36dcdc8f527ec2dbbd0a086
parentcbf6d71f6859fd6c036967ed19082f3e54efc328 (diff)
downloadforums-6a5b99b12b1812202843613994480cc6caf93354.tar
forums-6a5b99b12b1812202843613994480cc6caf93354.tar.gz
forums-6a5b99b12b1812202843613994480cc6caf93354.tar.bz2
forums-6a5b99b12b1812202843613994480cc6caf93354.tar.xz
forums-6a5b99b12b1812202843613994480cc6caf93354.zip
[ticket/14895] Fix broken tests
PHPBB3-14895
-rw-r--r--phpBB/phpbb/console/command/cron/cron_list.php4
-rw-r--r--tests/console/cron/cron_list_test.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index 8f9d63eda2..ea61e45235 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -81,13 +81,13 @@ class cron_list extends \phpbb\console\command\command
if (!empty($ready_tasks))
{
- $io->section($this->user->lang('TASKS_READY'));
+ $io->title($this->user->lang('TASKS_READY'));
$io->listing($ready_tasks);
}
if (!empty($not_ready_tasks))
{
- $io->section($this->user->lang('TASKS_NOT_READY'));
+ $io->title($this->user->lang('TASKS_NOT_READY'));
$io->listing($not_ready_tasks);
}
}
diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php
index 3bbe2078ba..fdc9a05cb2 100644
--- a/tests/console/cron/cron_list_test.php
+++ b/tests/console/cron/cron_list_test.php
@@ -50,19 +50,19 @@ class phpbb_console_command_cron_list_test extends phpbb_test_case
public function test_only_ready()
{
$this->initiate_test(2, 0);
- $this->assertContains('TASKS_READY command1 command2', preg_replace('/\s+/', ' ', trim($this->command_tester->getDisplay())));
+ $this->assertContains('TASKS_READY command1 command2', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay())));
}
public function test_only_not_ready()
{
$this->initiate_test(0, 2);
- $this->assertContains('TASKS_NOT_READY command1 command2', preg_replace('/\s+/', ' ', trim($this->command_tester->getDisplay())));
+ $this->assertContains('TASKS_NOT_READY command1 command2', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay())));
}
public function test_both_ready()
{
$this->initiate_test(2, 2);
- $this->assertSame('TASKS_READY command1 command2 TASKS_NOT_READY command3 command4', preg_replace('/\s+/', ' ', trim($this->command_tester->getDisplay())));
+ $this->assertSame('TASKS_READY command1 command2 TASKS_NOT_READY command3 command4', preg_replace('/[\s*=]+/', ' ', trim($this->command_tester->getDisplay())));
}
public function get_cron_manager(array $tasks)