From 0a707dd1ceec36b53ea45889b27051ed8a9a4e4b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 12 May 2013 11:35:46 +0200
Subject: [PATCH 1/8] [ticket/11531] Add basic set of functional tests for new
 avatar system

This currently includes tests for the gravatar, remote avatar, and upload
avatar drivers. The local avatar driver is currently not supported. Two
tests currently fail and have been marked as incomplete. One failure is
due to an issue with Symfony's DomCrawler that exists in Symfony < 2.2.
The other one is caused by a bug in the way remote avatars are treated.
According to my tests, this bug also exists in phpBB 3.0.11 and has been
reported in the tracker: http://tracker.phpbb.com/browse/PHPBB3-11534

PHPBB3-11531
---
 tests/functional/avatar_test.php | 210 +++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 tests/functional/avatar_test.php

diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
new file mode 100644
index 0000000000..b6dcc16e8a
--- /dev/null
+++ b/tests/functional/avatar_test.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_test extends phpbb_functional_test_case
+{
+	private $path;
+	private $form_content;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/board', 'ucp'));
+	}
+
+	public function test_acp_settings()
+	{
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		// Check the default entries we should have
+		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_gravatar]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+	}
+
+	public function test_gravatar_avatar()
+	{
+		// Get ACP settings
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$this->form_content = $form->getValues();
+
+		// Check if required form elements exist
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContains($this->lang('AVATAR_DRIVER_GRAVATAR_TITLE'), $crawler->filter('#avatar_driver')->text());
+		$this->assertContains($this->lang('GRAVATAR_AVATAR_EMAIL'), $crawler->text());
+
+		// Submit gravatar with correct email and correct size
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+
+		// Submit gravatar with correct mail but incorrect size
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(120);
+		$form['avatar_gravatar_height']->setValue(120);
+		$crawler = $this->client->submit($form);
+		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
+			$this->form_content['config[avatar_min_width]'],
+			$this->form_content['config[avatar_min_height]'],
+			$this->form_content['config[avatar_max_width]'],
+			$this->form_content['config[avatar_max_height]'],
+			'120',
+			'120'
+		), $crawler->text());
+
+		// Submit gravatar with incorrect email and correct size
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
+
+	public function test_upload_avatar()
+	{
+		// Check if required form elements exist
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_DRIVER_UPLOAD_TITLE'), $crawler->filter('#avatar_driver')->text());
+		$this->assertContains($this->lang('UPLOAD_AVATAR_FILE'), $crawler->text());
+		$this->assertContains($this->lang('UPLOAD_AVATAR_URL'), $crawler->text());
+
+		// Upload remote avatar with correct size and correct link
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+
+		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and size (s) = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_URL_INVALID'), $crawler->text());
+
+		// Submit gravatar with correct email and correct size
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->markTestIncomplete('Test fails due to bug in DomCrawler with Symfony < 2.2: https://github.com/symfony/symfony/issues/4674.');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+	}
+
+	public function test_remote_avatar()
+	{
+		// Get ACP settings
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$this->form_content = $form->getValues();
+
+		// Check if required form elements exist
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_DRIVER_REMOTE_TITLE'), $crawler->filter('#avatar_driver')->text());
+		$this->assertContains($this->lang('LINK_REMOTE_AVATAR'), $crawler->text());
+		$this->assertContains($this->lang('LINK_REMOTE_SIZE'), $crawler->text());
+
+		// Set remote avatar with correct size and correct link
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_remote');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(80);
+		$form['avatar_remote_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+
+		// Set remote avatar with incorrect size
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_remote');
+		// use default gravatar supplied by test@example.com and size (s) = 80px
+		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(120);
+		$form['avatar_remote_height']->setValue(120);
+		$crawler = $this->client->submit($form);
+		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
+			$this->form_content['config[avatar_min_width]'],
+			$this->form_content['config[avatar_min_height]'],
+			$this->form_content['config[avatar_max_width]'],
+			$this->form_content['config[avatar_max_height]'],
+			'120',
+			'120'
+		), $crawler->text());
+
+		// Enter correct data in form entries but select incorrect avatar driver
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and size (s) = 80px
+		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(80);
+		$form['avatar_remote_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+
+		/*
+		 * Enter incorrect link to a remote avatar_driver
+		 * Due to the fact that this link to phpbb.com will not serve a 404 error but rather a 404 page,
+		 * the remote avatar will think that this is a properly working avatar. This Bug also exists in
+		 * the current phpBB 3.0.11 release.
+		 */
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->markTestIncomplete('Test currently fails because the remote avatar does not seem to check if it is an image');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_remote');
+		// use random incorrect link to phpBB.com
+		$form['avatar_remote_url']->setValue('https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(80);
+		$form['avatar_remote_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+	}
+}

From 9c4d8b3193ca853d67c0098e1627db17f7dd0311 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 13 May 2013 11:57:41 +0200
Subject: [PATCH 2/8] [ticket/11531] Add acp and ucp groups functional tests
 for avatars

The test for the acp and ucp groups settings are currently marked as
incomplete due to a bug that causes the settings to not show an error
when incorrect data is entered. However, the avatar data is not saved.
That means that even though the error treatment seems to correctly work,
the user is never informed of the issues with the submitted avatar data.

PHPBB3-11531
---
 tests/functional/avatar_acp_test.php | 147 +++++++++++++++++++++++++++
 tests/functional/avatar_test.php     |  46 ++++++++-
 2 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 tests/functional/avatar_acp_test.php

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
new file mode 100644
index 0000000000..b359212be2
--- /dev/null
+++ b/tests/functional/avatar_acp_test.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
+{
+	private $path;
+	private $form_content;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/board', 'ucp', 'acp/users', 'acp/groups'));
+	}
+
+	public function test_acp_settings()
+	{
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		// Check the default entries we should have
+		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_gravatar]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+	}
+
+	public function test_user_acp_settings()
+	{
+		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Select "Avatar" in the drop-down menu
+		$form = $crawler->selectButton($this->lang('GO'))->form();
+		$form['mode']->select('avatar');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Select "Avatar" in the drop-down menu
+		$form = $crawler->selectButton($this->lang('GO'))->form();
+		$form['mode']->select('avatar');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test uploading a remote avatar
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Select "Avatar" in the drop-down menu
+		$form = $crawler->selectButton($this->lang('GO'))->form();
+		$form['mode']->select('avatar');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Submit gravatar with incorrect email and correct size
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
+
+	public function test_group_acp_settings()
+	{
+		// Test setting group avatar of admin group
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Test uploading a remote avatar
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Submit gravatar with incorrect email and correct size
+		$this->markTestIncomplete('No error when submitting incorrect acp group settings. This needs to be fixed ASAP.');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
+}
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index b6dcc16e8a..a29fb5ddb9 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -21,7 +21,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$this->path = __DIR__ . '/fixtures/files/';
 		$this->login();
 		$this->admin_login();
-		$this->add_lang(array('acp/board', 'ucp'));
+		$this->add_lang(array('acp/board', 'ucp', 'acp/groups'));
 	}
 
 	public function test_acp_settings()
@@ -207,4 +207,48 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$crawler = $this->client->submit($form);
 		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
 	}
+
+
+	public function test_group_ucp_settings()
+	{
+		// Test setting group avatar of admin group
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Test uploading a remote avatar
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Submit gravatar with incorrect email and correct size
+		$this->markTestIncomplete('No error when submitting incorrect ucp group settings. This needs to be fixed ASAP.');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
 }

From 76453b48ddededb9397e81aea8a75f419fcdc24b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 25 May 2013 18:15:54 +0200
Subject: [PATCH 3/8] [ticket/11531] Use assertContainsLang() where possible

PHBB3-11531
---
 tests/functional/avatar_acp_test.php | 30 ++++++++--------
 tests/functional/avatar_test.php     | 52 ++++++++++++++--------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
index b359212be2..623911fbf1 100644
--- a/tests/functional/avatar_acp_test.php
+++ b/tests/functional/avatar_acp_test.php
@@ -29,10 +29,10 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
 		// Check the default entries we should have
-		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
+		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
+		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
+		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
 
 		// Now start setting the needed settings
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -41,7 +41,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
 	public function test_user_acp_settings()
@@ -53,7 +53,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -62,7 +62,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
@@ -72,7 +72,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test uploading a remote avatar
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -80,7 +80,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
@@ -90,7 +90,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Submit gravatar with incorrect email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -99,7 +99,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
 	public function test_group_acp_settings()
@@ -107,7 +107,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -116,7 +116,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -128,7 +128,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -142,6 +142,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 }
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index a29fb5ddb9..e94eb4dcad 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -29,10 +29,10 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
 		// Check the default entries we should have
-		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
+		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
+		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
+		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
 
 		// Now start setting the needed settings
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -41,7 +41,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
 	public function test_gravatar_avatar()
@@ -55,9 +55,9 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
-		$this->assertContains($this->lang('AVATAR_DRIVER_GRAVATAR_TITLE'), $crawler->filter('#avatar_driver')->text());
-		$this->assertContains($this->lang('GRAVATAR_AVATAR_EMAIL'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
+		$this->assertContainsLang('AVATAR_DRIVER_GRAVATAR_TITLE', $crawler->filter('#avatar_driver')->text());
+		$this->assertContainsLang('GRAVATAR_AVATAR_EMAIL', $crawler->text());
 
 		// Submit gravatar with correct email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -66,7 +66,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Submit gravatar with correct mail but incorrect size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -92,7 +92,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
 	public function test_upload_avatar()
@@ -100,9 +100,9 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_DRIVER_UPLOAD_TITLE'), $crawler->filter('#avatar_driver')->text());
-		$this->assertContains($this->lang('UPLOAD_AVATAR_FILE'), $crawler->text());
-		$this->assertContains($this->lang('UPLOAD_AVATAR_URL'), $crawler->text());
+		$this->assertContainsLang('AVATAR_DRIVER_UPLOAD_TITLE', $crawler->filter('#avatar_driver')->text());
+		$this->assertContainsLang('UPLOAD_AVATAR_FILE', $crawler->text());
+		$this->assertContainsLang('UPLOAD_AVATAR_URL', $crawler->text());
 
 		// Upload remote avatar with correct size and correct link
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -110,7 +110,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -120,7 +120,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_URL_INVALID'), $crawler->text());
+		$this->assertContainsLang('AVATAR_URL_INVALID', $crawler->text());
 
 		// Submit gravatar with correct email and correct size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -130,7 +130,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_driver']->select('avatar_driver_upload');
 		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 	}
 
 	public function test_remote_avatar()
@@ -144,9 +144,9 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_DRIVER_REMOTE_TITLE'), $crawler->filter('#avatar_driver')->text());
-		$this->assertContains($this->lang('LINK_REMOTE_AVATAR'), $crawler->text());
-		$this->assertContains($this->lang('LINK_REMOTE_SIZE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_DRIVER_REMOTE_TITLE', $crawler->filter('#avatar_driver')->text());
+		$this->assertContainsLang('LINK_REMOTE_AVATAR', $crawler->text());
+		$this->assertContainsLang('LINK_REMOTE_SIZE', $crawler->text());
 
 		// Set remote avatar with correct size and correct link
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -156,7 +156,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Set remote avatar with incorrect size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -187,7 +187,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 
 		/*
 		 * Enter incorrect link to a remote avatar_driver
@@ -205,7 +205,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 	}
 
 
@@ -214,7 +214,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -223,7 +223,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -235,7 +235,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -249,6 +249,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 }

From 79823b9cafb41f4f9405c6a5bf7e0c46b0aa751b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 25 May 2013 18:17:33 +0200
Subject: [PATCH 4/8] [ticket/11531] Remove incomplete flags for tests after
 merging PR #1404

Issues should be fixed by the now resolved ticket PHPBB3-11535:
http://tracker.phpbb.com/browse/PHPBB3-11535

PHPBB3-11531
---
 tests/functional/avatar_acp_test.php | 1 -
 tests/functional/avatar_test.php     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
index 623911fbf1..efd0317571 100644
--- a/tests/functional/avatar_acp_test.php
+++ b/tests/functional/avatar_acp_test.php
@@ -135,7 +135,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
-		$this->markTestIncomplete('No error when submitting incorrect acp group settings. This needs to be fixed ASAP.');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_gravatar');
 		$form['avatar_gravatar_email']->setValue('test.example.com');
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index e94eb4dcad..4f0f6ee5f7 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -242,7 +242,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
-		$this->markTestIncomplete('No error when submitting incorrect ucp group settings. This needs to be fixed ASAP.');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_gravatar');
 		$form['avatar_gravatar_email']->setValue('test.example.com');

From 79dd44061bbfeab64dd2ff7b40541612c219c33c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 25 Jun 2013 00:17:51 +0200
Subject: [PATCH 5/8] [ticket/11531] Add changes for supporting modified
 testing framework

Additionally, the groups avatar is deleted after the avatar tests in the
ucp groups page in order to prevent issues with other tests that expect
that no avatar has been set for the admin group.

PHPBB3-11531
---
 tests/functional/avatar_acp_test.php | 27 ++++++---------
 tests/functional/avatar_test.php     | 49 ++++++++++++----------------
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
index efd0317571..609ccbb477 100644
--- a/tests/functional/avatar_acp_test.php
+++ b/tests/functional/avatar_acp_test.php
@@ -27,7 +27,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 	public function test_acp_settings()
 	{
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		// Check the default entries we should have
 		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
 		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
@@ -40,19 +39,18 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_gravatar]']->select(1);
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
 	public function test_user_acp_settings()
 	{
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Select "Avatar" in the drop-down menu
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
@@ -61,17 +59,16 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Select "Avatar" in the drop-down menu
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test uploading a remote avatar
@@ -79,17 +76,16 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Select "Avatar" in the drop-down menu
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Submit gravatar with incorrect email and correct size
@@ -98,7 +94,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
@@ -106,7 +102,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 	{
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
@@ -115,24 +110,22 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Test uploading a remote avatar
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -140,7 +133,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 }
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index 4f0f6ee5f7..c96ed46d30 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -27,7 +27,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	public function test_acp_settings()
 	{
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		// Check the default entries we should have
 		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
 		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
@@ -40,7 +39,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_gravatar]']->select(1);
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
@@ -48,13 +47,11 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Get ACP settings
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$this->form_content = $form->getValues();
 
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 		$this->assertContainsLang('AVATAR_DRIVER_GRAVATAR_TITLE', $crawler->filter('#avatar_driver')->text());
 		$this->assertContainsLang('GRAVATAR_AVATAR_EMAIL', $crawler->text());
@@ -65,7 +62,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Submit gravatar with correct mail but incorrect size
@@ -75,7 +72,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(120);
 		$form['avatar_gravatar_height']->setValue(120);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
 			$this->form_content['config[avatar_min_width]'],
 			$this->form_content['config[avatar_min_height]'],
@@ -91,7 +88,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
@@ -99,7 +96,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_DRIVER_UPLOAD_TITLE', $crawler->filter('#avatar_driver')->text());
 		$this->assertContainsLang('UPLOAD_AVATAR_FILE', $crawler->text());
 		$this->assertContainsLang('UPLOAD_AVATAR_URL', $crawler->text());
@@ -109,27 +105,25 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_URL_INVALID', $crawler->text());
 
 		// Submit gravatar with correct email and correct size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->markTestIncomplete('Test fails due to bug in DomCrawler with Symfony < 2.2: https://github.com/symfony/symfony/issues/4674.');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 	}
 
@@ -137,13 +131,11 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Get ACP settings
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$this->form_content = $form->getValues();
 
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_DRIVER_REMOTE_TITLE', $crawler->filter('#avatar_driver')->text());
 		$this->assertContainsLang('LINK_REMOTE_AVATAR', $crawler->text());
 		$this->assertContainsLang('LINK_REMOTE_SIZE', $crawler->text());
@@ -155,19 +147,18 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Set remote avatar with incorrect size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_remote');
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(120);
 		$form['avatar_remote_height']->setValue(120);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
 			$this->form_content['config[avatar_min_width]'],
 			$this->form_content['config[avatar_min_height]'],
@@ -179,14 +170,13 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 
 		// Enter correct data in form entries but select incorrect avatar driver
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 
 		/*
@@ -196,7 +186,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		 * the current phpBB 3.0.11 release.
 		 */
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->markTestIncomplete('Test currently fails because the remote avatar does not seem to check if it is an image');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_remote');
@@ -204,7 +193,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_url']->setValue('https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 	}
 
@@ -213,7 +202,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
@@ -222,24 +210,22 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Test uploading a remote avatar
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -247,7 +233,14 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
+
+		// Delete avatar
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_delete']->tick();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 	}
 }

From 96989e536dd5fc603f3598fa7a2a50414331d76c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Jul 2013 23:55:20 +0200
Subject: [PATCH 6/8] [ticket/11531] Use abstract class for avatar tests and
 unify test cases

PHPBB3-11531
---
 tests/functional/avatar_acp_groups_test.php | 152 ++++++++++++
 tests/functional/avatar_acp_test.php        | 139 -----------
 tests/functional/avatar_acp_users_test.php  | 152 ++++++++++++
 tests/functional/avatar_test.php            | 246 --------------------
 tests/functional/avatar_ucp_groups_test.php | 151 ++++++++++++
 tests/functional/avatar_ucp_users_test.php  | 151 ++++++++++++
 tests/functional/common_avatar_test.php     |  80 +++++++
 7 files changed, 686 insertions(+), 385 deletions(-)
 create mode 100644 tests/functional/avatar_acp_groups_test.php
 delete mode 100644 tests/functional/avatar_acp_test.php
 create mode 100644 tests/functional/avatar_acp_users_test.php
 delete mode 100644 tests/functional/avatar_test.php
 create mode 100644 tests/functional/avatar_ucp_groups_test.php
 create mode 100644 tests/functional/avatar_ucp_users_test.php
 create mode 100644 tests/functional/common_avatar_test.php

diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
new file mode 100644
index 0000000000..62b7409bdb
--- /dev/null
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5';
+	}
+
+	public function avatar_acp_groups_data()
+	{
+		return array(
+			// Correct Gravatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Incorrect email supplied for gravatar
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Upload image from remote
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			// Delete avatar image to reset group settings
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_acp_groups_data
+	*/
+	public function test_avatar_acp_groups($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
deleted file mode 100644
index 609ccbb477..0000000000
--- a/tests/functional/avatar_acp_test.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-/**
- * @group functional
- */
-class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
-{
-	private $path;
-	private $form_content;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->path = __DIR__ . '/fixtures/files/';
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('acp/board', 'ucp', 'acp/users', 'acp/groups'));
-	}
-
-	public function test_acp_settings()
-	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		// Check the default entries we should have
-		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
-		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
-		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
-		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
-
-		// Now start setting the needed settings
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['config[allow_avatar_local]']->select(1);
-		$form['config[allow_avatar_gravatar]']->select(1);
-		$form['config[allow_avatar_remote]']->select(1);
-		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
-	}
-
-	public function test_user_acp_settings()
-	{
-		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-
-		// Select "Avatar" in the drop-down menu
-		$form = $crawler->selectButton($this->lang('GO'))->form();
-		$form['mode']->select('avatar');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test if setting a gravatar avatar properly works
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-
-		// Select "Avatar" in the drop-down menu
-		$form = $crawler->selectButton($this->lang('GO'))->form();
-		$form['mode']->select('avatar');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test uploading a remote avatar
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-
-		// Select "Avatar" in the drop-down menu
-		$form = $crawler->selectButton($this->lang('GO'))->form();
-		$form['mode']->select('avatar');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-	}
-
-	public function test_group_acp_settings()
-	{
-		// Test setting group avatar of admin group
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test if setting a gravatar avatar properly works
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Test uploading a remote avatar
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-	}
-}
diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
new file mode 100644
index 0000000000..38ebcc8940
--- /dev/null
+++ b/tests/functional/avatar_acp_users_test.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'adm/index.php?i=acp_users&u=2&mode=avatar';
+	}
+
+	public function avatar_acp_users_data()
+	{
+		return array(
+			// Correct gravatar
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect sizes
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Gravatar with incorrect email
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Remote avatar with correct link
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			// Reset avatar settings
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_acp_users_data
+	*/
+	public function test_avatar_acp_users($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
deleted file mode 100644
index c96ed46d30..0000000000
--- a/tests/functional/avatar_test.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-/**
- * @group functional
- */
-class phpbb_functional_avatar_test extends phpbb_functional_test_case
-{
-	private $path;
-	private $form_content;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->path = __DIR__ . '/fixtures/files/';
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('acp/board', 'ucp', 'acp/groups'));
-	}
-
-	public function test_acp_settings()
-	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		// Check the default entries we should have
-		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
-		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
-		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
-		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
-
-		// Now start setting the needed settings
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['config[allow_avatar_local]']->select(1);
-		$form['config[allow_avatar_gravatar]']->select(1);
-		$form['config[allow_avatar_remote]']->select(1);
-		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
-	}
-
-	public function test_gravatar_avatar()
-	{
-		// Get ACP settings
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$this->form_content = $form->getValues();
-
-		// Check if required form elements exist
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-		$this->assertContainsLang('AVATAR_DRIVER_GRAVATAR_TITLE', $crawler->filter('#avatar_driver')->text());
-		$this->assertContainsLang('GRAVATAR_AVATAR_EMAIL', $crawler->text());
-
-		// Submit gravatar with correct email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-
-		// Submit gravatar with correct mail but incorrect size
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(120);
-		$form['avatar_gravatar_height']->setValue(120);
-		$crawler = self::submit($form);
-		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
-			$this->form_content['config[avatar_min_width]'],
-			$this->form_content['config[avatar_min_height]'],
-			$this->form_content['config[avatar_max_width]'],
-			$this->form_content['config[avatar_max_height]'],
-			'120',
-			'120'
-		), $crawler->text());
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-	}
-
-	public function test_upload_avatar()
-	{
-		// Check if required form elements exist
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_DRIVER_UPLOAD_TITLE', $crawler->filter('#avatar_driver')->text());
-		$this->assertContainsLang('UPLOAD_AVATAR_FILE', $crawler->text());
-		$this->assertContainsLang('UPLOAD_AVATAR_URL', $crawler->text());
-
-		// Upload remote avatar with correct size and correct link
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-
-		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and size (s) = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_URL_INVALID', $crawler->text());
-
-		// Submit gravatar with correct email and correct size
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->markTestIncomplete('Test fails due to bug in DomCrawler with Symfony < 2.2: https://github.com/symfony/symfony/issues/4674.');
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-	}
-
-	public function test_remote_avatar()
-	{
-		// Get ACP settings
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$this->form_content = $form->getValues();
-
-		// Check if required form elements exist
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_DRIVER_REMOTE_TITLE', $crawler->filter('#avatar_driver')->text());
-		$this->assertContainsLang('LINK_REMOTE_AVATAR', $crawler->text());
-		$this->assertContainsLang('LINK_REMOTE_SIZE', $crawler->text());
-
-		// Set remote avatar with correct size and correct link
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_remote');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(80);
-		$form['avatar_remote_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-
-		// Set remote avatar with incorrect size
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_remote');
-		// use default gravatar supplied by test@example.com and size (s) = 80px
-		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(120);
-		$form['avatar_remote_height']->setValue(120);
-		$crawler = self::submit($form);
-		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
-			$this->form_content['config[avatar_min_width]'],
-			$this->form_content['config[avatar_min_height]'],
-			$this->form_content['config[avatar_max_width]'],
-			$this->form_content['config[avatar_max_height]'],
-			'120',
-			'120'
-		), $crawler->text());
-
-		// Enter correct data in form entries but select incorrect avatar driver
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and size (s) = 80px
-		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(80);
-		$form['avatar_remote_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
-
-		/*
-		 * Enter incorrect link to a remote avatar_driver
-		 * Due to the fact that this link to phpbb.com will not serve a 404 error but rather a 404 page,
-		 * the remote avatar will think that this is a properly working avatar. This Bug also exists in
-		 * the current phpBB 3.0.11 release.
-		 */
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->markTestIncomplete('Test currently fails because the remote avatar does not seem to check if it is an image');
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_remote');
-		// use random incorrect link to phpBB.com
-		$form['avatar_remote_url']->setValue('https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(80);
-		$form['avatar_remote_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
-	}
-
-
-	public function test_group_ucp_settings()
-	{
-		// Test setting group avatar of admin group
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test if setting a gravatar avatar properly works
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Test uploading a remote avatar
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-
-		// Delete avatar
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_delete']->tick();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-	}
-}
diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
new file mode 100644
index 0000000000..bd34f67491
--- /dev/null
+++ b/tests/functional/avatar_ucp_groups_test.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5';
+	}
+
+	public function avatar_ucp_groups_data()
+	{
+		return array(
+			// Gravatar with correct settings
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect sizing
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Gravatar with incorrect email address
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Correct remote upload avatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_ucp_groups_data
+	*/
+	public function test_avatar_ucp_groups($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
new file mode 100644
index 0000000000..6b2c2344b3
--- /dev/null
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'ucp.php?i=ucp_profile&mode=avatar';
+	}
+
+	public function avatar_ucp_groups_data()
+	{
+		return array(
+			// Gravatar with correct settings
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect sizing
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Gravatar with incorrect email address
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Correct remote upload avatar
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_ucp_groups_data
+	*/
+	public function test_avatar_ucp_groups($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/common_avatar_test.php b/tests/functional/common_avatar_test.php
new file mode 100644
index 0000000000..c0f21d07c2
--- /dev/null
+++ b/tests/functional/common_avatar_test.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test_case
+{
+	private $path;
+	private $form_content;
+
+	abstract function get_url();
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/board', 'ucp', 'acp/users', 'acp/groups'));
+		$this->set_acp_settings();
+	}
+
+	private function set_acp_settings()
+	{
+		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		// Check the default entries we should have
+		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
+		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
+		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
+		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_gravatar]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = self::submit($form);
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
+	}
+
+	public function assert_avatar_submit($expected, $type, $data, $button_text = 'SUBMIT')
+	{
+		$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang($button_text))->form();
+		$form['avatar_driver']->select($type);
+
+		foreach ($data as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$form[$key]->$value[0]($value[1]);
+			}
+			else
+			{
+				$form[$key]->setValue($value);
+			}
+		}
+
+		$crawler = self::submit($form);
+
+		try
+		{
+			$this->assertContainsLang($expected, $crawler->text());
+		}
+		catch (Exception $e)
+		{
+			$this->assertContains($expected, $crawler->text());
+		}
+	}
+}

From e48f0555e9e40a9e1d3e9a60e25a9f206c565efe Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 14:36:38 +0200
Subject: [PATCH 7/8] [ticket/11531] Reduced amount of avatar functional tests
 to minimum

The tests were reduced to only test one case that should be correct and one
that should fail. Different test cases have been split up over the specific
test files for the acp groups, acp users, ucp groups, and ucp users page.

PHPBB3-11531
---
 tests/functional/avatar_acp_groups_test.php | 89 --------------------
 tests/functional/avatar_acp_users_test.php  | 91 ---------------------
 tests/functional/avatar_ucp_groups_test.php | 80 ------------------
 tests/functional/avatar_ucp_users_test.php  | 89 --------------------
 4 files changed, 349 deletions(-)

diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
index 62b7409bdb..9fdc29cc76 100644
--- a/tests/functional/avatar_acp_groups_test.php
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -42,95 +42,6 @@ class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_av
 					'avatar_gravatar_height'	=> 120,
 				),
 			),
-			// Incorrect email supplied for gravatar
-			array(
-				'EMAIL_INVALID_EMAIL',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test.example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Upload image from remote
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-				),
-			),
-			// Incorrect URL
-			array(
-				'AVATAR_URL_INVALID',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
-				),
-			),
-			/*
-			// Does not work due to DomCrawler issue
-			// Valid file upload
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
-				),
-			),
-			*/
-			// Correct remote avatar
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
-			// Wrong driver selected
-			array(
-				'NO_AVATAR_SELECTED',
-				'avatar_driver_upload',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			// Delete avatar image to reset group settings
 			array(
 				'GROUP_UPDATED',
diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
index 38ebcc8940..0afd05e530 100644
--- a/tests/functional/avatar_acp_users_test.php
+++ b/tests/functional/avatar_acp_users_test.php
@@ -22,26 +22,6 @@ class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_ava
 	public function avatar_acp_users_data()
 	{
 		return array(
-			// Correct gravatar
-			array(
-				'USER_AVATAR_UPDATED',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Gravatar with incorrect sizes
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 120,
-					'avatar_gravatar_height'	=> 120,
-				),
-			),
 			// Gravatar with incorrect email
 			array(
 				'EMAIL_INVALID_EMAIL',
@@ -60,77 +40,6 @@ class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_ava
 					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
 				),
 			),
-			// Incorrect URL
-			array(
-				'AVATAR_URL_INVALID',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
-				),
-			),
-			/*
-			// Does not work due to DomCrawler issue
-			// Valid file upload
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
-				),
-			),
-			*/
-			// Correct remote avatar
-			array(
-				'USER_AVATAR_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
-			// Wrong driver selected
-			array(
-				'NO_AVATAR_SELECTED',
-				'avatar_driver_upload',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'USER_AVATAR_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			// Reset avatar settings
 			array(
 				'USER_AVATAR_UPDATED',
diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
index bd34f67491..233b7d36e1 100644
--- a/tests/functional/avatar_ucp_groups_test.php
+++ b/tests/functional/avatar_ucp_groups_test.php
@@ -22,44 +22,6 @@ class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_av
 	public function avatar_ucp_groups_data()
 	{
 		return array(
-			// Gravatar with correct settings
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Gravatar with incorrect sizing
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 120,
-					'avatar_gravatar_height'	=> 120,
-				),
-			),
-			// Gravatar with incorrect email address
-			array(
-				'EMAIL_INVALID_EMAIL',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test.example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Correct remote upload avatar
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-				),
-			),
 			// Incorrect URL
 			array(
 				'AVATAR_URL_INVALID',
@@ -89,48 +51,6 @@ class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_av
 					'avatar_remote_height'	=> 80,
 				),
 			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
-			// Wrong driver selected
-			array(
-				'NO_AVATAR_SELECTED',
-				'avatar_driver_upload',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			array(
 				'GROUP_UPDATED',
 				'avatar_driver_gravatar',
diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index 6b2c2344b3..fa6282abf4 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -32,73 +32,6 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 					'avatar_gravatar_height'	=> 80,
 				),
 			),
-			// Gravatar with incorrect sizing
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 120,
-					'avatar_gravatar_height'	=> 120,
-				),
-			),
-			// Gravatar with incorrect email address
-			array(
-				'EMAIL_INVALID_EMAIL',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test.example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Correct remote upload avatar
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-				),
-			),
-			// Incorrect URL
-			array(
-				'AVATAR_URL_INVALID',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
-				),
-			),
-			/*
-			// Does not work due to DomCrawler issue
-			// Valid file upload
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
-				),
-			),
-			*/
-			// Correct remote avatar
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
 			// Wrong driver selected
 			array(
 				'NO_AVATAR_SELECTED',
@@ -109,28 +42,6 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 					'avatar_remote_height'	=> 80,
 				),
 			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			array(
 				'PROFILE_UPDATED',
 				'avatar_driver_gravatar',

From 2eb32ef515c59b19bd1bb4f7e6d56736733ea9d8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 22 Jul 2013 13:38:19 +0200
Subject: [PATCH 8/8] [ticket/11531] Check if uploaded avatar is properly
 displayed in tests

PHPBB3-11531
---
 tests/functional/avatar_ucp_users_test.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index fa6282abf4..f828559e0d 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -59,4 +59,20 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 	{
 		$this->assert_avatar_submit($expected, $avatar_type, $data);
 	}
+
+	public function test_display_upload_avatar()
+	{
+		$this->assert_avatar_submit('PROFILE_UPDATED',
+			'avatar_driver_upload',
+			array(
+				'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+			)
+		);
+
+		$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
+		$avatar_link = $crawler->filter('img')->attr('src');
+		$crawler = self::request('GET', $avatar_link . '&sid=' . $this->sid, array(), false);
+		$content = self::$client->getResponse()->getContent();
+		self::assertEquals(false, stripos(trim($content), 'debug'), 'Output contains debug message');
+	}
 }