10 files changed, 175 insertions, 13 deletions
diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php
index c0a136e173..e396b7b73e 100644
--- a/tests/extension/modules_test.php
+++ b/tests/extension/modules_test.php
@@ -209,7 +209,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
 	*/
 	public function test_modules_auth($module_auth, $expected)
 	{
-		global $phpbb_extension_manager;
+		global $phpbb_extension_manager, $phpbb_dispatcher;
 
 		$phpbb_extension_manager = $this->extension_manager = new phpbb_mock_extension_manager(
 			dirname(__FILE__) . '/',
@@ -227,6 +227,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
 			)
 		);
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
 		$this->assertEquals($expected, p_master::module_auth($module_auth, 0));
 	}
 }
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index cfd85571b7..d3fed18094 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -18,7 +18,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 
 		// check for logout link
 		$crawler = self::request('GET', 'index.php');
-		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
+		$this->assertContains($this->lang('LOGOUT', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
 	public function test_login_other()
@@ -26,7 +26,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->create_user('anothertestuser');
 		$this->login('anothertestuser');
 		$crawler = self::request('GET', 'index.php');
-		$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text());
+		$this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text());
 	}
 
 	/**
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 1d79043eae..5f02158e20 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -85,14 +85,14 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
 		$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());
 
-		$this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(1)->text());
-		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(1)->text());
-		$this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(1)->text());
-		$this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(1)->text());
+		$this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(2)->text());
 
 		$this->assertContains('The “vendor/test2” extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text());
 
-		$this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text());
 
 		$this->assertContains('phpBB Bar Extension', $crawler->filter('.ext_disabled')->eq(3)->text());
 		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(3)->text());
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index c291712c71..30f6fd7b47 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -76,6 +76,38 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 		$this->assertEquals($this->lang('DISALLOWED_EXTENSION', 'bif'), $crawler->filter('p.error')->text());
 	}
 
+	public function test_disallowed_content()
+	{
+		$this->login();
+
+		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
+		$this->assertEquals($this->lang('DISALLOWED_CONTENT'), $crawler->filter('p.error')->text());
+	}
+
+	public function test_disallowed_content_no_check()
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang('ucp');
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		$values["config[check_attachment_content]"] = 0;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+
+		// Request index for correct URL
+		$crawler = self::request('GET', 'index.php?sid=' . $this->sid);
+
+		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
+
+		// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
+		// DISALLOWED_CONTENT check
+		$this->assertEquals($this->lang('UNABLE_GET_IMAGE_SIZE'), $crawler->filter('p.error')->text());
+	}
+
 	public function test_too_large()
 	{
 		$this->create_user('fileupload');
diff --git a/tests/functional/fixtures/files/disallowed.jpg b/tests/functional/fixtures/files/disallowed.jpg
new file mode 100644
index 0000000000..06a437585a
--- /dev/null
+++ b/tests/functional/fixtures/files/disallowed.jpg
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index dd1b8ec981..9ae37842fe 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -60,7 +60,7 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
 		$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());
+		$this->assertContains('notificationtestuser', $crawler->filter('#username_logged_in')->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');
diff --git a/tests/functions_content/get_username_string_test.php b/tests/functions_content/get_username_string_test.php
new file mode 100644
index 0000000000..1f23f19056
--- /dev/null
+++ b/tests/functions_content/get_username_string_test.php
@@ -0,0 +1,126 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+
+class phpbb_functions_content_get_username_string_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $auth, $phpbb_dispatcher, $user;
+		$auth = $this->getMock('\phpbb\auth\auth');
+		$auth->expects($this->any())
+			->method('acl_get')
+			->with($this->stringContains('_'), $this->anything())
+			->will($this->returnValueMap(array(
+				array('u_viewprofile', true),
+			)));
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
+		$user->data['user_id'] = ANONYMOUS;
+		$user->lang['GUEST'] = 'Guest';
+	}
+
+	public function get_username_string_profile_data()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		return array(
+			array(ANONYMOUS, 'Anonymous', '', false, false, ''),
+			array(2, 'Administrator', 'FF0000', false, false, "{$phpbb_root_path}memberlist.$phpEx?mode=viewprofile&amp;u=2"),
+			array(42, 'User42', '', false, 'http://www.example.org/user.php?mode=show', 'http://www.example.org/user.php?mode=show&amp;u=42'),
+		);
+	}
+
+	/**
+	* @dataProvider get_username_string_profile_data
+	*/
+	public function test_get_username_string_profile($user_id, $username, $user_colour, $guest_username, $custom_profile_url, $expected)
+	{
+		$this->assertEquals($expected, get_username_string('profile', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
+	}
+
+	public function get_username_string_username_data()
+	{
+		return array(
+			array(ANONYMOUS, '', '', false, false, 'Guest'),
+			array(ANONYMOUS, '', '', 'CustomName', false, 'CustomName'),
+			array(2, 'User2', '', false, false, 'User2'),
+			array(5, 'User5', '', 'Anonymous', false, 'User5'),
+			array(128, 'User128', '', false, false, 'User128'),
+		);
+	}
+
+	/**
+	* @dataProvider get_username_string_username_data
+	*/
+	public function test_get_username_string_username($user_id, $username, $user_colour, $guest_username, $custom_profile_url, $expected)
+	{
+		$this->assertEquals($expected, get_username_string('username', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
+	}
+
+	public function get_username_string_colour_data()
+	{
+		return array(
+			array(0, '', '', false, false, ''),
+			array(0, '', 'F0F0F0', false, false, '#F0F0F0'),
+			array(ANONYMOUS, 'Anonymous', '000000', false, false, '#000000'),
+			array(2, 'Administrator', '', false, false, ''),
+		);
+	}
+
+	/**
+	* @dataProvider get_username_string_colour_data
+	*/
+	public function test_get_username_string_colour($user_id, $username, $user_colour, $guest_username, $custom_profile_url, $expected)
+	{
+		$this->assertEquals($expected, get_username_string('colour', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
+	}
+
+	public function get_username_string_full_data()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		return array(
+			array(0, '', '', false, false, 'Guest'),
+			array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'),
+			array(2, 'Administrator', 'FF0000', false, false, '<a href="' . $phpbb_root_path . 'memberlist.' . $phpEx . '?mode=viewprofile&amp;u=2" style="color: #FF0000;" class="username-coloured">Administrator</a>'),
+			array(5, 'User5', '', false, 'http://www.example.org/user.php?mode=show', '<a href="http://www.example.org/user.php?mode=show&amp;u=5">User5</a>'),
+			array(8, 'Eight', '', false, false, '<a href="' . $phpbb_root_path . 'memberlist.php?mode=viewprofile&amp;u=8">Eight</a>'),
+		);
+	}
+
+	/**
+	* @dataProvider get_username_string_full_data
+	*/
+	public function test_get_username_string_full($user_id, $username, $user_colour, $guest_username, $custom_profile_url, $expected)
+	{
+		$this->assertEquals($expected, get_username_string('full', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
+	}
+
+	public function get_username_string_no_profile_data()
+	{
+		return array(
+			array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'),
+			array(ANONYMOUS, 'Anonymous', '', '', false, 'Guest'),
+			array(2, 'Administrator', 'FF0000', false, false, '<span style="color: #FF0000;" class="username-coloured">Administrator</span>'),
+			array(8, 'Eight', '', false, false, 'Eight'),
+		);
+	}
+
+	/**
+	* @dataProvider get_username_string_no_profile_data
+	*/
+	public function test_get_username_string_no_profile($user_id, $username, $user_colour, $guest_username, $custom_profile_url, $expected)
+	{
+		$this->assertEquals($expected, get_username_string('no_profile', $user_id, $username, $user_colour, $guest_username, $custom_profile_url));
+	}
+}
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php
index 2d26be7da5..40bb110185 100644
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -38,7 +38,7 @@ class phpbb_passwords_helper_test extends PHPUnit_Framework_TestCase
 	public function test_helper_encode64($input, $length, $output)
 	{
 		$return = $this->driver_helper->hash_encode64($input, $length);
-		$this->assertEquals($output, $return);
+		$this->assertSame($output, $return);
 	}
 
 	public function data_get_random_salt()
@@ -61,8 +61,8 @@ class phpbb_passwords_helper_test extends PHPUnit_Framework_TestCase
 		while ((microtime(true) - $start) < 1)
 		{
 			$urandom_string = (empty($rand_seed)) ? $this->driver_helper->get_random_salt($length) : $this->driver_helper->get_random_salt($length, $rand_seed);
-			$this->assertEquals($length, strlen($urandom_string));
-			$this->assertNotEquals($rand_string, $urandom_string);
+			$this->assertSame($length, strlen($urandom_string));
+			$this->assertNotSame($rand_string, $urandom_string);
 		}
 	}
 
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index ee295ff043..008f222696 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -273,7 +273,7 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase
 		// Limit test to 1 second
 		while ((microtime(true) - $time) < 1)
 		{
-			$this->assertNotEquals($first_id, $this->driver_helper->unique_id());
+			$this->assertNotSame($first_id, $this->driver_helper->unique_id());
 		}
 	}
 
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 87cd00197f..492f31cee6 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -143,6 +143,8 @@ class phpbb_filespec_test extends phpbb_test_case
 		$disallowed_content = explode('|', $this->config['mime_triggers']);
 		$filespec = $this->get_filespec(array('tmp_name' => $this->path . $filename));
 		$this->assertEquals($expected, $filespec->check_content($disallowed_content));
+		// All files should pass if $disallowed_content is empty
+		$this->assertEquals(true, $filespec->check_content(array()));
 	}
 
 	public function clean_filename_variables()