aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-21 14:54:32 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-21 14:54:32 +0100
commit2a023c9e15ffd03f07770adf6e8372d3b4e23057 (patch)
tree242e90b696746171f94d31bbf7c24afcf0550a92 /tests
parent289524938ca527816a902f1a2acb9cf385c2598d (diff)
parentc628cd7e151a09e25ca0d980620b5fa3fe36a763 (diff)
downloadforums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.gz
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.bz2
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.xz
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.zip
Merge pull request #5727 from marc1706/ticket/16167
[ticket/16167] Use user_email column for checking duplicates
Diffstat (limited to 'tests')
-rw-r--r--tests/auth/provider_apache_test.php1
-rw-r--r--tests/functions/fixtures/validate_email.xml4
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php
index b1c84d47b6..ebc97c204a 100644
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -121,7 +121,6 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i',
'user_passchg' => '0',
'user_email' => 'example@example.com',
- 'user_email_hash' => '0',
'user_birthday' => '',
'user_lastvisit' => '0',
'user_lastmark' => '0',
diff --git a/tests/functions/fixtures/validate_email.xml b/tests/functions/fixtures/validate_email.xml
index fa139f6f18..985050cedc 100644
--- a/tests/functions/fixtures/validate_email.xml
+++ b/tests/functions/fixtures/validate_email.xml
@@ -30,14 +30,14 @@
<column>username_clean</column>
<column>user_permissions</column>
<column>user_sig</column>
- <column>user_email_hash</column>
+ <column>user_email</column>
<row>
<value>1</value>
<value>admin</value>
<value>admin</value>
<value></value>
<value></value>
- <value>143317126117</value>
+ <value>admin@example.com</value>
</row>
</table>
</dataset>