diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 18:46:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 18:46:30 +0200 |
| commit | b4183eda0caae2dfbe1425db27f3618c98db8504 (patch) | |
| tree | 06e737e8494ca08e286f842c42780cde52466cc1 /tests/functions/fixtures | |
| parent | 97c29c38760ccb3b121ca486bcd85ef683352f37 (diff) | |
| parent | 30801e1f0a9aab6a3b4e589be1e43309543e8293 (diff) | |
| download | forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar.gz forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar.bz2 forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar.xz forums-b4183eda0caae2dfbe1425db27f3618c98db8504.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11579] Add method for validating emails for valid MX and mark as slow
[ticket/11579] Do not extend validate_data_helper
[ticket/11579] Add missing commas to validate_username_test
[ticket/11579] Rework calls to validate_data_helper
[ticket/11579] Move simple tests into seperate files
[ticket/11579] Use test case helper class and use assert prefix for method
[ticket/11579] Move tests into seperate files depending on needed fixture
[ticket/11579] Remove unnecessary globals from validate_password()
[ticket/11579] Add remaining unit tests for validate_data functions
[ticket/11579] Add basic set of unit tests for validate_data()
Conflicts:
tests/mock/cache.php
Diffstat (limited to 'tests/functions/fixtures')
| -rw-r--r-- | tests/functions/fixtures/validate_email.xml | 23 | ||||
| -rw-r--r-- | tests/functions/fixtures/validate_username.xml | 38 |
2 files changed, 61 insertions, 0 deletions
diff --git a/tests/functions/fixtures/validate_email.xml b/tests/functions/fixtures/validate_email.xml new file mode 100644 index 0000000000..de7fce8a08 --- /dev/null +++ b/tests/functions/fixtures/validate_email.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> + <table name="phpbb_users"> + <column>user_id</column> + <column>username</column> + <column>username_clean</column> + <column>user_permissions</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> + <column>user_email_hash</column> + <row> + <value>1</value> + <value>admin</value> + <value>admin</value> + <value></value> + <value></value> + <value></value> + <value></value> + <value>143317126117</value> + </row> + </table> +</dataset> diff --git a/tests/functions/fixtures/validate_username.xml b/tests/functions/fixtures/validate_username.xml new file mode 100644 index 0000000000..fbe398469c --- /dev/null +++ b/tests/functions/fixtures/validate_username.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> + <table name="phpbb_groups"> + <column>group_name</column> + <column>group_desc</column> + <row> + <value>foobar_group</value> + <value>test123</value> + </row> + </table> + <table name="phpbb_users"> + <column>user_id</column> + <column>username</column> + <column>username_clean</column> + <column>user_permissions</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> + <row> + <value>1</value> + <value>admin</value> + <value>admin</value> + <value></value> + <value></value> + <value></value> + <value></value> + </row> + <row> + <value>2</value> + <value>moderator</value> + <value>moderator</value> + <value></value> + <value></value> + <value></value> + <value></value> + </row> + </table> +</dataset> |