From 2b6145da0a439e4a6ef509bc9df10c22c5679108 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 2 Apr 2014 21:01:09 +0200
Subject: [ticket/12341] Update test with new class name and dependencies

PHPBB3-12341
---
 tests/functions_content/get_username_string_test.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/functions_content/get_username_string_test.php')

diff --git a/tests/functions_content/get_username_string_test.php b/tests/functions_content/get_username_string_test.php
index 48e8936cc1..1f23f19056 100644
--- a/tests/functions_content/get_username_string_test.php
+++ b/tests/functions_content/get_username_string_test.php
@@ -16,14 +16,15 @@ class phpbb_functions_content_get_username_string_test extends phpbb_test_case
 	{
 		parent::setUp();
 
-		global $auth, $user;
-		$auth = $this->getMock('auth');
+		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';
 	}
-- 
cgit v1.2.1


From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 27 May 2014 20:18:06 +0200
Subject: [ticket/12594] Remove @package tags and update file headers

PHPBB3-12594
---
 tests/functions_content/get_username_string_test.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'tests/functions_content/get_username_string_test.php')

diff --git a/tests/functions_content/get_username_string_test.php b/tests/functions_content/get_username_string_test.php
index 1f23f19056..502796d1df 100644
--- a/tests/functions_content/get_username_string_test.php
+++ b/tests/functions_content/get_username_string_test.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
-- 
cgit v1.2.1


From 665742945f37a11a84ff3dc7190607a048fee485 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 25 Jun 2014 09:33:48 +0200
Subject: [ticket/12662] Update tests that utilize get_username_string

PHPBB3-12662
---
 tests/functions_content/get_username_string_test.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/functions_content/get_username_string_test.php')

diff --git a/tests/functions_content/get_username_string_test.php b/tests/functions_content/get_username_string_test.php
index 502796d1df..01ec97f6a4 100644
--- a/tests/functions_content/get_username_string_test.php
+++ b/tests/functions_content/get_username_string_test.php
@@ -94,11 +94,11 @@ class phpbb_functions_content_get_username_string_test extends phpbb_test_case
 		global $phpbb_root_path, $phpEx;
 
 		return array(
-			array(0, '', '', false, false, 'Guest'),
-			array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'),
+			array(0, '', '', false, false, '<span class="username">Guest</span>'),
+			array(ANONYMOUS, 'Anonymous', '', false, false, '<span class="username">Anonymous</span>'),
 			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>'),
+			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" class="username">User5</a>'),
+			array(8, 'Eight', '', false, false, '<a href="' . $phpbb_root_path . 'memberlist.php?mode=viewprofile&amp;u=8" class="username">Eight</a>'),
 		);
 	}
 
@@ -113,10 +113,10 @@ class phpbb_functions_content_get_username_string_test extends phpbb_test_case
 	public function get_username_string_no_profile_data()
 	{
 		return array(
-			array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'),
-			array(ANONYMOUS, 'Anonymous', '', '', false, 'Guest'),
+			array(ANONYMOUS, 'Anonymous', '', false, false, '<span class="username">Anonymous</span>'),
+			array(ANONYMOUS, 'Anonymous', '', '', false, '<span class="username">Guest</span>'),
 			array(2, 'Administrator', 'FF0000', false, false, '<span style="color: #FF0000;" class="username-coloured">Administrator</span>'),
-			array(8, 'Eight', '', false, false, 'Eight'),
+			array(8, 'Eight', '', false, false, '<span class="username">Eight</span>'),
 		);
 	}
 
-- 
cgit v1.2.1