makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16123] Add tests to cover different ban reasons

Browse source 
PHPBB3-16123
This commit is contained in:
Marc Alexander 2019-09-07 13:24:20 +02:00
parent 56e2f1a3f6
commit cf898133a4
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/functions/fixtures/validate_email.xml
View file

@ -1,5 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<dataset> <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"> <table name="phpbb_users">
<column>user_id</column> <column>user_id</column>
<column>username</column> <column>username</column>

10
tests/functions/validate_user_email_test.php
View file

@ -28,10 +28,14 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
protected function setUp() protected function setUp()
{ {
global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
parent::setUp(); parent::setUp();
$this->db = $this->new_dbal(); $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); $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; $config['email_check_mx'] = $check_mx;
$db = $this->db; $db = $this->db;
$user = $this->user; $user = $this->user;
$user->optionset('banned_users', array('banned@example.com'));
} }
public static function validate_user_email_data() 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('valid_complex', array(), "'%$~test@example.com"),
array('invalid', array('EMAIL_INVALID'), 'fööbar@example.com'), array('invalid', array('EMAIL_INVALID'), 'fööbar@example.com'),
array('taken', array('EMAIL_TAKEN'), 'admin@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')
); );
} }