4 files changed, 188 insertions, 11 deletions
diff --git a/tests/avatar/fixtures/users.xml b/tests/avatar/fixtures/users.xml
index 3e6586e909..1773d438c2 100644
--- a/tests/avatar/fixtures/users.xml
+++ b/tests/avatar/fixtures/users.xml
@@ -29,5 +29,33 @@
             <value></value>
             <value></value>
         </row>
+        <row>
+            <value>3</value>
+            <value>foo</value>
+            <value></value>
+            <value></value>
+            <value>g5_1414350991.jpg</value>
+            <value>avatar.driver.upload</value>
+            <value>80</value>
+            <value>80</value>
+        </row>
+    </table>
+    <table name="phpbb_groups">
+        <column>group_id</column>
+        <column>group_type</column>
+        <column>group_name</column>
+        <column>group_avatar</column>
+        <column>group_avatar_type</column>
+        <column>group_avatar_width</column>
+        <column>group_avatar_height</column>
+        <row>
+            <value>5</value>
+            <value>3</value>
+            <value>ADMINISTRATORS</value>
+            <value>g5_1414350991.jpg</value>
+            <value>avatar.driver.upload</value>
+            <value>80</value>
+            <value>80</value>
+        </row>
     </table>
 </dataset>
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 81c153aed4..a109a7b5de 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -299,17 +299,32 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 	public function data_handle_avatar_delete()
 	{
 		return array(
-			array(array(
-				'avatar'		=> '',
-				'avatar_type'	=> '',
-				'avatar_width'	=> 0,
-				'avatar_height'	=> 0,
-			), 1, array(
-				'avatar'		=> 'foobar@example.com',
-				'avatar_type'	=> 'avatar.driver.gravatar',
-				'avatar_width'	=> '16',
-				'avatar_height'	=> '16',
-			), USERS_TABLE, 'user_'),
+			array(
+				array(
+					'avatar'		=> '',
+					'avatar_type'	=> '',
+					'avatar_width'	=> 0,
+					'avatar_height'	=> 0,
+				), 1, array(
+					'avatar'		=> 'foobar@example.com',
+					'avatar_type'	=> 'avatar.driver.gravatar',
+					'avatar_width'	=> '16',
+					'avatar_height'	=> '16',
+				), USERS_TABLE, 'user_',
+			),
+			array(
+				array(
+					'avatar'		=> '',
+					'avatar_type'	=> '',
+					'avatar_width'	=> 0,
+					'avatar_height'	=> 0,
+				), 5, array(
+					'avatar'		=> 'g5_1414350991.jpg',
+					'avatar_type'	=> 'avatar.driver.upload',
+					'avatar_width'	=> '80',
+					'avatar_height'	=> '80'
+				), GROUPS_TABLE, 'group_',
+			),
 		);
 	}
 
@@ -333,4 +348,23 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 			$this->assertEquals($value, $row[$key]);
 		}
 	}
+
+	/**
+	 * @dependsOn test_handle_avatar_delete
+	 */
+	public function test_user_group_avatar_deleted()
+	{
+		$sql = 'SELECT * FROM ' . USERS_TABLE . '
+				WHERE user_id = 3';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->manager->clean_row($this->db->sql_fetchrow($result), 'user');
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals(array(
+			'avatar'		=> '',
+			'avatar_type'	=> '',
+			'avatar_width'	=> 0,
+			'avatar_height'	=> 0,
+		), $row);
+	}
 }
diff --git a/tests/functions/make_clickable_test.php b/tests/functions/make_clickable_test.php
new file mode 100644
index 0000000000..e61cb2c30e
--- /dev/null
+++ b/tests/functions/make_clickable_test.php
@@ -0,0 +1,100 @@
+<?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.
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+
+class phpbb_functions_make_clickable_test extends phpbb_test_case
+{
+	/**
+	* Tags:
+	* 'm' - full URL like xxxx://aaaaa.bbb.cccc.
+	* 'l' - local relative board URL like http://domain.tld/path/to/board/index.php
+	* 'w' - URL without http/https protocol like www.xxxx.yyyy[/zzzz] aka 'lazy' URLs
+	* 'e' - email@domain type address
+	*
+	* Classes:
+	* "postlink-local" for 'l' URLs
+	* "postlink" for the rest of URLs
+	* empty for email addresses
+	**/
+	public function data_test_make_clickable_url_positive()
+	{
+		return array(
+			array(
+				'http://www.phpbb.com/community/',
+				'<!-- m --><a class="postlink" href="http://www.phpbb.com/community/">http://www.phpbb.com/community/</a><!-- m -->'
+			),
+			array(
+				'http://www.phpbb.com/path/file.ext#section',
+				'<!-- m --><a class="postlink" href="http://www.phpbb.com/path/file.ext#section">http://www.phpbb.com/path/file.ext#section</a><!-- m -->'
+			),
+			array(
+				'ftp://ftp.phpbb.com/',
+				'<!-- m --><a class="postlink" href="ftp://ftp.phpbb.com/">ftp://ftp.phpbb.com/</a><!-- m -->'
+			),
+			array(
+				'sip://bantu@phpbb.com',
+				'<!-- m --><a class="postlink" href="sip://bantu@phpbb.com">sip://bantu@phpbb.com</a><!-- m -->'
+			),
+			array(
+				'www.phpbb.com/community/',
+				'<!-- w --><a class="postlink" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->'
+			),
+			array(
+				'http://testhost/viewtopic.php?t=1',
+				'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
+			),
+			array(
+				'email@domain.com',
+				'<!-- e --><a href="mailto:email@domain.com">email@domain.com</a><!-- e -->'
+			),
+			// Test appending punctuation mark to the URL
+			array(
+				'http://testhost/viewtopic.php?t=1!',
+				'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->!'
+			),
+			array(
+				'www.phpbb.com/community/?',
+				'<!-- w --><a class="postlink" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->?'
+			),
+			// Test shortened text for URL > 55 characters long
+			// URL text should be turned into: first 39 chars + ' ... ' + last 10 chars
+			array(
+				'http://www.phpbb.com/community/path/to/long/url/file.ext#section',
+				'<!-- m --><a class="postlink" href="http://www.phpbb.com/community/path/to/long/url/file.ext#section">http://www.phpbb.com/community/path/to/ ... xt#section</a><!-- m -->'
+			),
+
+			// IDN is not parsed and returned as is
+			array('http://домен.рф', 'http://домен.рф'),
+			array('почта@домен.рф', 'почта@домен.рф'),
+		);
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		global $config, $user, $request;
+		$user = new phpbb_mock_user();
+		$request = new phpbb_mock_request();
+	}
+
+	/**
+	 * @dataProvider data_test_make_clickable_url_positive
+	 */
+	public function test_urls_matching_positive($url, $expected)
+	{
+		$this->assertSame($expected, make_clickable($url));
+	}
+}
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 3832307897..bb68f8b3bc 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -411,6 +411,21 @@ class phpbb_path_helper_test extends phpbb_test_case
 				'http://www.phpbb.com/community',
 				'../community/',
 			),
+			array(
+				'http://www.phpbb.com/foobar',
+				'http://www.phpbb.com',
+				'',
+			),
+			array(
+				'http://www.foobar.com',
+				'http://www.phpbb.com',
+				'/www.phpbb.com/',
+			),
+			array(
+				'foobar',
+				'http://www.phpbb.com/community',
+				'',
+			)
 		);
 	}