13 files changed, 105 insertions, 98 deletions
diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
index 35f7956252..925335a2f7 100644
--- a/tests/functional/avatar_acp_groups_test.php
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -48,7 +48,7 @@ class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_av
 			),
 			// Delete avatar image to reset group settings
 			array(
-				'GROUP_UPDATED',
+				array('CONFIRM_AVATAR_DELETE', 'GROUP_UPDATED'),
 				'avatar_driver_gravatar',
 				array(
 					'avatar_delete'	=> array('tick', ''),
diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
index 38e001f516..5eca473157 100644
--- a/tests/functional/avatar_acp_users_test.php
+++ b/tests/functional/avatar_acp_users_test.php
@@ -46,7 +46,7 @@ class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_ava
 			),
 			// Reset avatar settings
 			array(
-				'USER_AVATAR_UPDATED',
+				array('CONFIRM_AVATAR_DELETE', 'USER_AVATAR_UPDATED'),
 				'avatar_driver_gravatar',
 				array(
 					'avatar_delete'	=> array('tick', ''),
diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
index fddf66933f..1e8ca911c6 100644
--- a/tests/functional/avatar_ucp_groups_test.php
+++ b/tests/functional/avatar_ucp_groups_test.php
@@ -55,7 +55,7 @@ class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_av
 				),
 			),
 			array(
-				'GROUP_UPDATED',
+				array('CONFIRM_AVATAR_DELETE', 'GROUP_UPDATED'),
 				'avatar_driver_gravatar',
 				array(
 					'avatar_delete'	=> array('tick', ''),
diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index 62cd79c307..972bfa0fb2 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -36,18 +36,9 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 					'avatar_gravatar_height'	=> 80,
 				),
 			),
-			// 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,
-				),
-			),
+
 			array(
-				'PROFILE_UPDATED',
+				array('CONFIRM_AVATAR_DELETE', 'PROFILE_UPDATED'),
 				'avatar_driver_gravatar',
 				array(
 					'avatar_delete'	=> array('tick', ''),
diff --git a/tests/functional/common_avatar_test.php b/tests/functional/common_avatar_test.php
index 1bb9e5cd8e..82d7136c98 100644
--- a/tests/functional/common_avatar_test.php
+++ b/tests/functional/common_avatar_test.php
@@ -50,7 +50,7 @@ abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
-	public function assert_avatar_submit($expected, $type, $data, $button_text = 'SUBMIT')
+	public function assert_avatar_submit($expected, $type, $data, $delete = false, $button_text = 'SUBMIT')
 	{
 		$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
 
@@ -72,6 +72,12 @@ abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test
 
 		$crawler = self::submit($form);
 
+		if (is_array($expected))
+		{
+			$delete_expected = $expected[1];
+			$expected = $expected[0];
+		}
+
 		try
 		{
 			$this->assertContainsLang($expected, $crawler->text());
@@ -80,5 +86,12 @@ abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test
 		{
 			$this->assertContains($expected, $crawler->text());
 		}
+
+		if ($delete)
+		{
+			$form = $crawler->selectButton('confirm')->form();
+			$crawler = self::submit($form);
+			$this->assertContainsLang($delete_expected, $crawler->text());
+		}
 	}
 }
diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index 6a6df14c81..4e4995c21e 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -80,20 +80,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 			'attachments' => true,
 		));
 
-		// Download topic archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
@@ -147,18 +133,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 		$this->add_lang('viewtopic');
 
-		// Download topic archive as guest: still works
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// No download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
 		// No download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
@@ -167,20 +141,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		// Login as admin and try again, should work now.
 		$this->login();
 
-		// Download topic archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as admin
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
@@ -235,16 +195,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 		$this->add_lang('viewtopic');
 
-		// Download topic archive as guest: still works
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
-		// No download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
 		// No download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
@@ -253,20 +203,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		// Login as admin and try again, should work now.
 		$this->login();
 
-		// Download topic archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as admin
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index b6dd5db708..6490c1ead3 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -84,7 +84,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
 		$this->assertCount(1, $crawler->filter('.ext_enabled'));
-		$this->assertCount(4, $crawler->filter('.ext_disabled'));
+		$this->assertCount(5, $crawler->filter('.ext_disabled'));
 
 		$this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
 		$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());
@@ -162,6 +162,10 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
 		$this->assertContains($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('#main')->text());
+
+		// Correctly submit the enable form
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor3%2Ffoo&sid=' . $this->sid);
+		$this->assertContainsLang('EXTENSION_NOT_ENABLEABLE', $crawler->filter('.errorbox')->text());
 	}
 
 	public function test_disable_pre()
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index b9d55fbd3c..e87953367f 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -42,8 +42,6 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 			unlink($fileinfo->getPathname());
 		}
-
-		parent::tearDown();
 	}
 
 	private function upload_file($filename, $mimetype)
@@ -109,9 +107,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
 
-		// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
+		// Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the
 		// DISALLOWED_CONTENT check
-		$this->assertEquals($this->lang('UNABLE_GET_IMAGE_SIZE'), $crawler->filter('p.error')->text());
+		$this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text());
 	}
 
 	public function test_too_large()
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index b170fc051f..6ece150b23 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -11,6 +11,8 @@
 *
 */
 
+require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
+
 /**
  * @group functional
  */
@@ -43,8 +45,6 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		global $config, $user;
 		$user = null;
 		$config = array();
-
-		parent::tearDown();
 	}
 
 	public function test_invalid_extension()
diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index c95efc5b2e..64fa19557f 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php
@@ -57,7 +57,5 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 			'config[allow_password_reset]'	=> 1,
 		));
 		$crawler = self::submit($form);
-
-		parent::tearDown();
 	}
 }
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index e4a960f862..667d268b1e 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -21,20 +21,20 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
 		return array(
 			// Rows inserted by phpBB/install/schemas/schema_data.sql
 			// Also see PHPBB3-11460
-			array('post_notification', true),
-			array('topic_notification', true),
-			array('post_email', true),
-			array('topic_email', true),
+			array('notification.type.post_notification', true),
+			array('notification.type.topic_notification', true),
+			array('notification.type.post_notification.method.email', true),
+			array('notification.type.topic_notification.method.email', true),
 
 			// Default behaviour for in-board notifications:
 			// If user did not opt-out, in-board notifications are on.
-			array('bookmark_notification', true),
-			array('quote_notification', true),
+			array('notification.type.bookmark_notification', true),
+			array('notification.type.quote_notification', true),
 
 			// Default behaviour for email notifications:
 			// If user did not opt-in, email notifications are off.
-			array('bookmark_email', false),
-			array('quote_email', false),
+			array('notification.type.bookmark_notification.method.email', false),
+			array('notification.type.quote_notification.method.email', false),
 		);
 	}
 
diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php
index d9faec035c..ee71597ffc 100644
--- a/tests/functional/plupload_test.php
+++ b/tests/functional/plupload_test.php
@@ -57,8 +57,6 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 
 			unlink($fileinfo->getPathname());
 		}
-
-		parent::tearDown();
 	}
 
 	public function get_urls()
diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php
new file mode 100644
index 0000000000..1f6dc3a979
--- /dev/null
+++ b/tests/functional/private_messages_test.php
@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_private_messages_test extends phpbb_functional_test_case
+{
+	public function test_setup_config()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=board&mode=message");
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		// Set the maximum number of private messages per folder to 1
+		$values['config[pm_max_msgs]'] = 1;
+
+		$form->setValues($values);
+
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text());
+	}
+
+	public function test_inbox_full()
+	{
+		$this->login();
+		$message_id = $this->create_private_message('Test private message #1', 'This is a test private message sent by the testing framework.', array(2));
+
+		$crawler = self::request('GET', "ucp.php?i=pm&mode=view&sid{$this->sid}&p={$message_id}");
+		$this->assertContains($this->lang('UCP_PM_VIEW'), $crawler->filter('html')->text());
+
+		$message_id = $this->create_private_message('Test private message #2', 'This is a test private message sent by the testing framework.', array(2));
+
+		$crawler = self::request('GET', "ucp.php?i=pm&mode=view&sid{$this->sid}&p={$message_id}");
+		$this->assertContains($this->lang('NO_AUTH_READ_HOLD_MESSAGE'), $crawler->filter('html')->text());
+	}
+
+	public function test_restore_config()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=board&mode=message");
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		$values['config[pm_max_msgs]'] = 50;
+
+		$form->setValues($values);
+
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text());
+	}
+}