diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:39:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:39:54 +0200 |
| commit | 3c38fcce40b28d7b67f4a9686be88044eda40b9a (patch) | |
| tree | 95a6309b163a12f008d2bb7867152117228e589f /tests/profilefields | |
| parent | b9890c6a4c7c30215ce7863825917f9152326081 (diff) | |
| parent | 6b58f406630f7c98e00e2dd1b4db0c55e4e76ba9 (diff) | |
| download | forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar.gz forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar.bz2 forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar.xz forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.zip | |
Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field
* Dragooon/ticket/12732:
[ticket/12732] Update schema.json for Skype
[ticket/12732] Add functional test for Skype profile field
[ticket/12732] Values shouldn't be escaped for schema_data.sql
[ticket/12732] Set field_active to 1 for Skype's field
[ticket/12732] Add unit tests for ALPHA_PUNCTUATION
[ticket/12732] Missing comma after validation definition
[ticket/12732] Improve ALPHA_PUNCTUATION description
[ticket/12732] Use user info instead of chat as default Skype action
[ticket/12732] Add Skype custom profile field
Conflicts:
phpBB/install/schemas/schema.json
phpBB/install/schemas/schema_data.sql
phpBB/language/en/memberlist.php
tests/functional/ucp_profile_test.php
tests/profilefields/type_string_test.php
Diffstat (limited to 'tests/profilefields')
| -rw-r--r-- | tests/profilefields/type_string_test.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php index 97d024fbaa..cee8a1d863 100644 --- a/tests/profilefields/type_string_test.php +++ b/tests/profilefields/type_string_test.php @@ -155,6 +155,18 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case 'FIELD_INVALID_CHARS_ALPHA_DOTS-field', 'Required field should reject field with comma', ), + array( + 'skype.test.name,_this', + array('field_validation' => '[a-zA-Z][\w\.,\-_]+'), + false, + 'Required field should accept alphanumeric field with punctuations', + ), + array( + '1skype.this.should.faila', + array('field_validation' => '[a-zA-Z][\w\.,\-_]+'), + 'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION-field', + 'Required field should reject field having invalid input for the given validation', + ), ); } |