3 files changed, 18 insertions, 8 deletions
diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php
index 7db69e332c..09ed51890c 100644
--- a/tests/functions_user/delete_user_test.php
+++ b/tests/functions_user/delete_user_test.php
@@ -7,9 +7,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
 {
@@ -25,19 +23,19 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
 	{
 		parent::setUp();
 
-		global $cache, $config, $db, $phpbb_dispatcher, $phpbb_container;
+		global $cache, $config, $db, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path;
 
 		$db = $this->db = $this->new_dbal();
 		$config = new \phpbb\config\config(array(
 			'load_online_time'	=> 5,
 			'search_type'		=> '\phpbb\search\fulltext_mysql',
 		));
-		set_config(false, false, false, $config);
-		set_config_count(false, false, false, $config);
 		$cache = new phpbb_mock_null_cache();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$phpbb_container = new phpbb_mock_container_builder();
 		$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
+		// Works as a workaround for tests
+		$phpbb_container->set('attachment.manager', new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\filesystem\filesystem(), new \phpbb\attachment\resync($db), $phpbb_root_path));
 		$phpbb_container->set(
 			'auth.provider.db',
 			new phpbb_mock_auth_provider()
@@ -48,6 +46,11 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
 			'auth.provider_collection',
 			$provider_collection
 		);
+		$phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens');
+		$phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states');
+		$phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts');
+
+		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 	}
 
 	 public function first_last_post_data()
diff --git a/tests/functions_user/fixtures/delete_user.xml b/tests/functions_user/fixtures/delete_user.xml
index 56014b35d1..8de2659722 100644
--- a/tests/functions_user/fixtures/delete_user.xml
+++ b/tests/functions_user/fixtures/delete_user.xml
@@ -515,35 +515,44 @@
 	</table>
 	<table name="phpbb_privmsgs_folder">
 		<column>user_id</column>
+		<column>folder_id</column>
 		<row>
 			<value>2</value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>3</value>
+			<value>2</value>
 		</row>
 	</table>
 	<table name="phpbb_privmsgs_rules">
 		<column>user_id</column>
 		<column>rule_string</column>
+		<column>rule_id</column>
 		<row>
 			<value>2</value>
 			<value></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>3</value>
 			<value></value>
+			<value>2</value>
 		</row>
 	</table>
 	<table name="phpbb_drafts">
 		<column>user_id</column>
 		<column>draft_message</column>
+		<column>draft_id</column>
 		<row>
 			<value>2</value>
 			<value></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>3</value>
 			<value></value>
+			<value>2</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php
index 99a15b32bf..3124d57ba0 100644
--- a/tests/functions_user/group_user_attributes_test.php
+++ b/tests/functions_user/group_user_attributes_test.php
@@ -11,9 +11,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_functions_user_group_user_attributes_test extends phpbb_database_test_case
 {
@@ -139,7 +137,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
 		$auth = $this->getMock('\phpbb\auth\auth');
 		$auth->expects($this->any())
 			->method('acl_clear_prefetch');
-		$cache_driver = new \phpbb\cache\driver\null();
+		$cache_driver = new \phpbb\cache\driver\dummy();
 		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
 		$phpbb_container
 			->expects($this->any())