diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-12 21:24:11 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-12 21:24:11 -0700 |
| commit | d62973867511d4f2b337a4c1cf3654ee20a2a107 (patch) | |
| tree | 6124d4dff71fea9d64ab4ed511c9bec8b624533b /tests/test_framework | |
| parent | f02a8cf0e63c4107550fc4d9d973c34ffbfe0e03 (diff) | |
| parent | 9bec7b21a2aae7328592732122faf4b9b1cfc4be (diff) | |
| download | forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar.gz forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar.bz2 forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar.xz forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.zip | |
Merge pull request #1617 from EXreaction/ticket/11744
[ticket/11744] Group join request notification
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_connection_manager.php | 2 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index c93a777701..9d2cfebd29 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -138,7 +138,7 @@ class phpbb_database_test_connection_manager catch (PDOException $e) { $cleaned_dsn = str_replace($this->config['dbpasswd'], '*password*', $dsn); - throw new Exception("Unable do connect to $cleaned_dsn using PDO with error: {$e->getMessage()}"); + throw new Exception("Unable to connect to $cleaned_dsn using PDO with error: {$e->getMessage()}"); } $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index ce748bb9cf..eb40cddfe5 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -533,12 +533,9 @@ class phpbb_functional_test_case extends phpbb_test_case $cache = new phpbb_mock_null_cache; $cache_driver = new phpbb_cache_driver_null(); - $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); - $phpbb_container - ->expects($this->any()) - ->method('get') - ->with('cache.driver') - ->will($this->returnValue($cache_driver)); + $phpbb_container = new phpbb_mock_container_builder(); + $phpbb_container->set('cache.driver', $cache_driver); + $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); if (!function_exists('utf_clean_string')) { |