diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:37:51 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:37:51 +0200 |
| commit | b9890c6a4c7c30215ce7863825917f9152326081 (patch) | |
| tree | e7b03ee965ceecfe2bb61f3b07997059f448cb7f /tests | |
| parent | 8595fee0401c66511d508fd2d2f0a69609ce5770 (diff) | |
| parent | cdfcbfc6d0c7c1ea7f1b5c802eaa85887934f829 (diff) | |
| download | forums-b9890c6a4c7c30215ce7863825917f9152326081.tar forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.gz forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.bz2 forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.xz forums-b9890c6a4c7c30215ce7863825917f9152326081.zip | |
Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field
* Dragooon/ticket/12733:
[ticket/12733] Add functional test for twitter profile field
[ticket/12733] Values needn't be escaped for schema_data.sql
[ticket/12733] Set field_active to 1 for Twitter
[ticket/12733] Convert spaces to tabs
[ticket/12733] Fix spacing for block header in profilefield_twitter.php
[ticket/12733] Update schema.json
[ticket/12733] Add Twitter 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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/ucp_profile_test.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/functional/ucp_profile_test.php b/tests/functional/ucp_profile_test.php index 2cc279eccc..8003640e76 100644 --- a/tests/functional/ucp_profile_test.php +++ b/tests/functional/ucp_profile_test.php @@ -25,15 +25,19 @@ 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_location' => 'Bertie´s Empire', 'pf_phpbb_facebook' => 'phpbb', + 'pf_phpbb_location' => 'Bertie´s Empire', + 'pf_phpbb_twitter' => 'phpbb_twitter', )); + $crawler = self::submit($form); $this->assertContainsLang('PROFILE_UPDATED', $crawler->filter('#message')->text()); $crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=profile_info'); $form = $crawler->selectButton('Submit')->form(); - $this->assertEquals('Bertie´s Empire', $form->get('pf_phpbb_location')->getValue()); + $this->assertEquals('phpbb', $form->get('pf_phpbb_facebook')->getValue()); + $this->assertEquals('Bertie´s Empire', $form->get('pf_phpbb_location')->getValue()); + $this->assertEquals('phpbb_twitter', $form->get('pf_phpbb_twitter')->getValue()); } } |