13 files changed, 111 insertions, 58 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 0db3f13617..527bb223d5 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -152,12 +152,24 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 		return array(
 			array(
 				array(
-					'user_avatar'			=> '',
-					'user_avatar_type'		=> '',
-					'user_avatar_width'		=> '',
+					'user_avatar'		=> '',
+					'user_avatar_type'	=> '',
+					'user_avatar_width'	=> '',
 					'user_avatar_height'	=> '',
+					'group_avatar'		=> '',
 				),
 				array(
+					'user_avatar'		=> '',
+					'user_avatar_type'	=> '',
+					'user_avatar_width'	=> '',
+					'user_avatar_height'	=> '',
+					'group_avatar'		=> '',
+				),
+				'foobar',
+			),
+			array(
+				array(),
+				array(
 					'avatar'			=> '',
 					'avatar_type'		=> '',
 					'avatar_width'		=> '',
@@ -166,40 +178,41 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 			),
 			array(
 				array(
-					'group_avatar'			=> '',
-					'group_avatar_type'		=> '',
-					'group_avatar_width'	=> '',
-					'group_avatar_height'	=> '',
+					'user_avatar'	=> '',
+					'user_id'	=> 5,
+					'group_id'	=> 4,
 				),
 				array(
-					'avatar'			=> '',
-					'avatar_type'		=> '',
-					'avatar_width'		=> '',
-					'avatar_height'		=> '',
+					'user_avatar'	=> '',
+					'user_id'	=> 5,
+					'group_id'	=> 4,
 				),
 			),
 			array(
-				array(),
 				array(
-					'avatar'			=> '',
-					'avatar_type'		=> '',
-					'avatar_width'		=> '',
-					'avatar_height'		=> '',
+					'user_avatar'	=> '',
+					'user_id'	=> 5,
+					'group_id'	=> 4,
+				),
+				array(
+					'avatar'	=> '',
+					'id'		=> 5,
+					'group_id'	=> 4,
 				),
+				'user',
 			),
 			array(
 				array(
-					'foobar_avatar'			=> '',
-					'foobar_avatar_type'	=> '',
-					'foobar_avatar_width'	=> '',
-					'foobar_avatar_height'	=> '',
+					'group_avatar'	=> '',
+					'user_id'	=> 5,
+					'group_id'	=> 4,
 				),
 				array(
-					'foobar_avatar'			=> '',
-					'foobar_avatar_type'	=> '',
-					'foobar_avatar_width'	=> '',
-					'foobar_avatar_height'	=> '',
+					'avatar'	=> '',
+					'id'		=> 'g4',
+					'user_id'	=> 5,
 				),
+				'group',
 			),
 		);
 	}
@@ -207,14 +220,15 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 	/**
 	* @dataProvider database_row_data
 	*/
-	public function test_clean_row(array $input, array $output)
+	public function test_clean_row(array $input, array $output, $prefix = '')
 	{
 		$cleaned_row = array();
 
-		$cleaned_row = \phpbb\avatar\manager::clean_row($input);
-		foreach ($output as $key => $null)
+		$cleaned_row = \phpbb\avatar\manager::clean_row($input, $prefix);
+		foreach ($output as $key => $value)
 		{
 			$this->assertArrayHasKey($key, $cleaned_row);
+			$this->assertEquals($cleaned_row[$key], $value);
 		}
 	}
 
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 41bd48c204..37752b8fbb 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -19,6 +19,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	static protected $fixtures = array(
 		'foo/bar/config/',
 		'foo/bar/controller/',
+		'foo/bar/event/',
+		'foo/bar/language/en/',
 		'foo/bar/styles/prosilver/template/',
 	);
 
diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php
index fb8f87e6de..094eda8257 100644
--- a/tests/functional/extension_global_lang_test.php
+++ b/tests/functional/extension_global_lang_test.php
@@ -17,8 +17,9 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
 	static private $helper;
 
 	static protected $fixtures = array(
-		'foo/bar/language/en/',
+		'foo/bar/config/',
 		'foo/bar/event/',
+		'foo/bar/language/en/',
 	);
 
 	static public function setUpBeforeClass()
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index 19adb89819..e922abdaf1 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -17,8 +17,9 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 	static private $helper;
 
 	static protected $fixtures = array(
-		'foo/bar/language/en/',
+		'foo/bar/config/',
 		'foo/bar/event/',
+		'foo/bar/language/en/',
 	);
 
 	static public function setUpBeforeClass()
diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
index cb9dbc9514..e3e5fc21cd 100644
--- a/tests/functional/fixtures/ext/foo/bar/composer.json
+++ b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -14,7 +14,7 @@
 	}],
 	"require": {
 		"php": ">=5.3",
-		"phpbb": "3.1.*@dev"
+		"phpbb/phpbb": "3.1.*@dev"
 	},
 	"extra": {
 		"display-name": "phpBB 3.1 Extension Testing"
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index 3bca4c6567..64e1163408 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -4,3 +4,12 @@ services:
         arguments:
             - @controller.helper
             - @template
+    foo_bar.listener.permission:
+        class: foo\bar\event\permission
+        tags:
+            - { name: event.listener }
+    foo_bar.listener.user_setup:
+        class: foo\bar\event\user_setup
+        tags:
+            - { name: event.listener }
+
diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php
index 92e24074ad..9b319dd35f 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/permission.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission.php
@@ -11,15 +11,6 @@
 namespace foo\bar\event;
 
 /**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * Event listener
 */
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
index 1409f97470..8fa7ac97da 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
@@ -11,15 +11,6 @@
 namespace foo\bar\event;
 
 /**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * Event listener
 */
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index 7f33ad1859..dd1b8ec981 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -52,4 +52,37 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
 			$this->assert_checkbox_is_unchecked($cplist, $checkbox_name);
 		}
 	}
+
+	public function test_mark_notifications_read()
+	{
+		// Create a new standard user
+		$this->create_user('notificationtestuser');
+		$this->add_user_group('NEWLY_REGISTERED', array('notificationtestuser'));
+		$this->login('notificationtestuser');
+		$crawler = self::request('GET', 'index.php');
+		$this->assertContains('notificationtestuser', $crawler->filter('.icon-logout')->text());
+
+		// Post a new post that needs approval
+		$this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD');
+		$crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}");
+		$this->assertNotContains('This is a test post posted by notificationtestuser.', $crawler->filter('html')->text());
+
+		// logout
+		$crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
+
+		// admin login
+		$this->login();
+		$this->add_lang('ucp');
+		$crawler = self::request('GET', 'ucp.php?i=ucp_notifications');
+
+		// At least one notification should exist
+		$this->assertGreaterThan(0, $crawler->filter('#notification_list_button strong')->text());
+
+		// Get form token
+		$link = $crawler->selectLink($this->lang('NOTIFICATIONS_MARK_ALL_READ'))->link()->getUri();
+		$crawler = self::request('GET', substr($link, strpos($link, 'ucp.')));
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		$this->assertEquals(0, $crawler->filter('#notification_list_button strong')->text());
+	}
 }
diff --git a/tests/functions_install/ignore_new_file_on_update_test.php b/tests/functions_install/ignore_new_file_on_update_test.php
index ae1dde96f7..703da4e435 100644
--- a/tests/functions_install/ignore_new_file_on_update_test.php
+++ b/tests/functions_install/ignore_new_file_on_update_test.php
@@ -25,6 +25,8 @@ class phpbb_functions_install_ignore_new_file_on_update_test extends phpbb_test_
 
 			array('styles/prosilver/theme/en/icon_user_online.gif', false),
 			array('styles/prosilver/theme/languagewillneverexist/icon_user_online.gif', true),
+
+			array('styles/prosilver/theme/imageset.css', false),
 		);
 	}
 
diff --git a/tests/notification/base.php b/tests/notification/base.php
index 549545f01b..f6333866c3 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -70,6 +70,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 			array(),
 			$this->container,
 			$this->user_loader,
+			$this->config,
 			$this->db,
 			$this->cache,
 			$this->user,
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index 8597c626a4..a9ed59686a 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -118,7 +118,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 
 		// Notification Manager
 		$phpbb_notifications = new \phpbb\notification\manager($notification_types_array, array(),
-			$phpbb_container, $user_loader, $db, $cache, $user,
+			$phpbb_container, $user_loader, $config, $db, $cache, $user,
 			$phpbb_root_path, $phpEx,
 			NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE);
 		$phpbb_container->set('notification_manager', $phpbb_notifications);
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index a0d186e0f2..eba5a2dfdf 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -868,9 +868,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* @param string $subject
 	* @param string $message
 	* @param array $additional_form_data Any additional form data to be sent in the request
-	* @return array post_id, topic_id
+	* @param string $expected Lang var of expected message after posting
+	* @return array|null post_id, topic_id if message is 'POST_STORED'
 	*/
-	public function create_topic($forum_id, $subject, $message, $additional_form_data = array())
+	public function create_topic($forum_id, $subject, $message, $additional_form_data = array(), $expected = 'POST_STORED')
 	{
 		$posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}";
 
@@ -880,7 +881,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'post'			=> true,
 		), $additional_form_data);
 
-		return self::submit_post($posting_url, 'POST_TOPIC', $form_data);
+		return self::submit_post($posting_url, 'POST_TOPIC', $form_data, $expected);
 	}
 
 	/**
@@ -893,9 +894,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* @param string $subject
 	* @param string $message
 	* @param array $additional_form_data Any additional form data to be sent in the request
-	* @return array post_id, topic_id
+	* @param string $expected Lang var of expected message after posting
+	* @return array|null post_id, topic_id if message is 'POST_STORED'
 	*/
-	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array())
+	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = 'POST_STORED')
 	{
 		$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}";
 
@@ -905,7 +907,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'post'			=> true,
 		), $additional_form_data);
 
-		return self::submit_post($posting_url, 'POST_REPLY', $form_data);
+		return self::submit_post($posting_url, 'POST_REPLY', $form_data, $expected);
 	}
 
 	/**
@@ -914,9 +916,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* @param string $posting_url
 	* @param string $posting_contains
 	* @param array $form_data
-	* @return array post_id, topic_id
+	* @param string $expected Lang var of expected message after posting
+	* @return array|null post_id, topic_id if message is 'POST_STORED'
 	*/
-	protected function submit_post($posting_url, $posting_contains, $form_data)
+	protected function submit_post($posting_url, $posting_contains, $form_data, $expected = 'POST_STORED')
 	{
 		$this->add_lang('posting');
 
@@ -945,7 +948,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
 		// Instead, I send it as a request with the submit button "post" set to true.
 		$crawler = self::request('POST', $posting_url, $form_data);
-		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
+		$this->assertContainsLang($expected, $crawler->filter('html')->text());
+
+		if ($expected !== 'POST_STORED')
+		{
+			return;
+		}
 		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri();
 
 		return array(