diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:55:29 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:55:29 -0700 |
| commit | 4859cec0c50cc522e73dba5555def308835b1357 (patch) | |
| tree | 3a14ab74c35a76081d53361b143c454f21b7473e /tests/test_framework | |
| parent | 07e7cde5609342c655c1f8d7d0e01a98cddc040b (diff) | |
| parent | 0dcb874c0987156b0c4bb2ef4e935ff6b6f2fd46 (diff) | |
| download | forums-4859cec0c50cc522e73dba5555def308835b1357.tar forums-4859cec0c50cc522e73dba5555def308835b1357.tar.gz forums-4859cec0c50cc522e73dba5555def308835b1357.tar.bz2 forums-4859cec0c50cc522e73dba5555def308835b1357.tar.xz forums-4859cec0c50cc522e73dba5555def308835b1357.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/13207' into prep-release-3.1.0
* github-marc1706/ticket/13207:
[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')
| -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 49cc72363e..840ff981cb 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')) { |