diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:56:26 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:56:26 -0700 |
| commit | 33d0872a18e38a694352fcd604649bc65c7da16d (patch) | |
| tree | f3e1ba9faffce7c0540e249d5264283b2915ba2b /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 12f7275c8eb636d96ffdd6ab6e7c913a7b567164 (diff) | |
| parent | 26d4483d36ec82f6dc8f4943f289be94302ab7ce (diff) | |
| download | forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar.gz forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar.bz2 forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar.xz forums-33d0872a18e38a694352fcd604649bc65c7da16d.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13207] Add notification manager mock to user_add method in tests
[ticket/13207] Move default user notifications settings to user_add()
[ticket/13207] Add default subscription options for newly registered users
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index c47ae2cab6..ffc5266200 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -556,12 +556,10 @@ 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_notifications = new phpbb_mock_notification_manager(); + $phpbb_container->set('notification_manager', $phpbb_notifications); if (!function_exists('utf_clean_string')) { |