From cf898133a4fa0c412911a9b65a533c84524edc34 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 7 Sep 2019 13:24:20 +0200
Subject: [ticket/16123] Add tests to cover different ban reasons

PHPBB3-16123
---
 tests/functions/fixtures/validate_email.xml  | 21 +++++++++++++++++++++
 tests/functions/validate_user_email_test.php | 10 +++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/functions/fixtures/validate_email.xml b/tests/functions/fixtures/validate_email.xml
index eb4fd90217..5a21e51d13 100644
--- a/tests/functions/fixtures/validate_email.xml
+++ b/tests/functions/fixtures/validate_email.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
+	<table name="phpbb_banlist">
+		<column>ban_userid</column>
+		<column>ban_exclude</column>
+		<column>ban_end</column>
+		<column>ban_email</column>
+		<column>ban_give_reason</column>
+		<row>
+			<value>0</value>
+			<value>0</value>
+			<value>0</value>
+			<value>banned@example.com</value>
+			<value></value>
+		</row>
+		<row>
+			<value>0</value>
+			<value>0</value>
+			<value>0</value>
+			<value>banned2@example.com</value>
+			<value>just because</value>
+		</row>
+	</table>
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username</column>
diff --git a/tests/functions/validate_user_email_test.php b/tests/functions/validate_user_email_test.php
index 8dcec88103..f64d01517c 100644
--- a/tests/functions/validate_user_email_test.php
+++ b/tests/functions/validate_user_email_test.php
@@ -28,10 +28,14 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
 
 	protected function setUp()
 	{
+		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+
 		parent::setUp();
 
 		$this->db = $this->new_dbal();
-		$this->user = new phpbb_mock_user;
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+		$this->user = new phpbb\user($language, '\phpbb\datetime');
 		$this->helper = new phpbb_functions_validate_data_helper($this);
 	}
 
@@ -47,7 +51,6 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
 		$config['email_check_mx'] = $check_mx;
 		$db = $this->db;
 		$user = $this->user;
-		$user->optionset('banned_users', array('banned@example.com'));
 	}
 
 	public static function validate_user_email_data()
@@ -58,7 +61,8 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
 			array('valid_complex', array(), "'%$~test@example.com"),
 			array('invalid', array('EMAIL_INVALID'), 'fööbar@example.com'),
 			array('taken', array('EMAIL_TAKEN'), 'admin@example.com'),
-			array('banned', array('EMAIL_BANNED'), 'banned@example.com'),
+			array('banned', ['just because'], 'banned2@example.com'),
+			array('banned', ['EMAIL_BANNED'], 'banned@example.com')
 		);
 	}
 
-- 
cgit v1.2.1


From d186df8cb40f5375ae7143fb432cb36cafe7d0a1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 7 Sep 2019 21:57:38 +0200
Subject: [ticket/16123] Purge cache to ensure up to date ban list in tests

PHPBB3-16123
---
 tests/functions/validate_user_email_test.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/functions/validate_user_email_test.php b/tests/functions/validate_user_email_test.php
index f64d01517c..d23ffc0503 100644
--- a/tests/functions/validate_user_email_test.php
+++ b/tests/functions/validate_user_email_test.php
@@ -28,10 +28,12 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
 
 	protected function setUp()
 	{
-		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+		global $cache, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		parent::setUp();
 
+		$cache = new \phpbb\cache\driver\file();
+		$cache->purge();
 		$this->db = $this->new_dbal();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$language = new phpbb\language\language(new phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
-- 
cgit v1.2.1


From 4abdfd1709d1c39362656de70f95d762e3f031f8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 8 Sep 2019 09:40:56 +0200
Subject: [ticket/16123] Specify ban_id in validate email fixture

PHPBB3-16123
---
 tests/functions/fixtures/validate_email.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/functions/fixtures/validate_email.xml b/tests/functions/fixtures/validate_email.xml
index 5a21e51d13..fa139f6f18 100644
--- a/tests/functions/fixtures/validate_email.xml
+++ b/tests/functions/fixtures/validate_email.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
 	<table name="phpbb_banlist">
+		<column>ban_id</column>
 		<column>ban_userid</column>
 		<column>ban_exclude</column>
 		<column>ban_end</column>
 		<column>ban_email</column>
 		<column>ban_give_reason</column>
 		<row>
+			<value>1</value>
 			<value>0</value>
 			<value>0</value>
 			<value>0</value>
@@ -14,6 +16,7 @@
 			<value></value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>0</value>
 			<value>0</value>
 			<value>0</value>
-- 
cgit v1.2.1