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/functional/ucp_profile_test.php | |
| 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/functional/ucp_profile_test.php')
| -rw-r--r-- | tests/functional/ucp_profile_test.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/functional/ucp_profile_test.php b/tests/functional/ucp_profile_test.php index 8003640e76..46b67ff843 100644 --- a/tests/functional/ucp_profile_test.php +++ b/tests/functional/ucp_profile_test.php @@ -25,9 +25,10 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case $this->assertContainsLang('UCP_PROFILE_PROFILE_INFO', $crawler->filter('#cp-main h2')->text()); $form = $crawler->selectButton('Submit')->form(array( - 'pf_phpbb_facebook' => 'phpbb', + 'pf_phpbb_facebook' => 'phpbb', 'pf_phpbb_location' => 'Bertie´s Empire', - 'pf_phpbb_twitter' => 'phpbb_twitter', + 'pf_phpbb_skype' => 'phpbb.skype.account', + 'pf_phpbb_twitter' => 'phpbb_twitter', )); $crawler = self::submit($form); @@ -38,6 +39,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case $this->assertEquals('phpbb', $form->get('pf_phpbb_facebook')->getValue()); $this->assertEquals('Bertie´s Empire', $form->get('pf_phpbb_location')->getValue()); + $this->assertEquals('phpbb.skype.account', $form->get('pf_phpbb_skype')->getValue()); $this->assertEquals('phpbb_twitter', $form->get('pf_phpbb_twitter')->getValue()); } } |