[Fusionforge-commits] r7704 - in trunk: gforge/www/my tests/func/Site

[Alain Peyrat]

Author: aljeux
Date: 2009-05-28 21:39:53 +0200 (Thu, 28 May 2009)
New Revision: 7704

Modified:
   trunk/gforge/www/my/index.php
   trunk/tests/func/Site/projects.php
Log:
Fix [#31] user page has UTF-8 problems

Modified: trunk/gforge/www/my/index.php
===================================================================
--- trunk/gforge/www/my/index.php	2009-05-27 16:24:43 UTC (rev 7703)
+++ trunk/gforge/www/my/index.php	2009-05-28 19:39:53 UTC (rev 7704)
@@ -427,7 +427,7 @@
 					     '<img src="'.$HTML->imgroot.'ic/'.$img.'" alt="'._('Delete').'" height="16" width="16" border="0" />') ;
 
 			echo '</td>
-			<td>'.util_make_link_g (db_result($result,$i,'unix_group_name'),db_result($result,$i,'group_id'),htmlspecialchars(db_result($result,$i,'group_name'))).'</td>
+			<td>'.util_make_link_g (db_result($result,$i,'unix_group_name'),db_result($result,$i,'group_id'), db_result($result,$i,'group_name')).'</td>
 			<td>'. htmlspecialchars(db_result($result,$i,'role_name')) .'</td></tr>';
 		}
 	}

Modified: trunk/tests/func/Site/projects.php
===================================================================
--- trunk/tests/func/Site/projects.php	2009-05-27 16:24:43 UTC (rev 7703)
+++ trunk/tests/func/Site/projects.php	2009-05-28 19:39:53 UTC (rev 7704)
@@ -9,7 +9,7 @@
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
- * 
+ *
  * FusionForge is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -67,7 +67,7 @@
 		$this->type("purpose", "This is a simple description for project A");
 		$this->type("description", "This is the public description for project A.");
 		$this->type("unix_name", "projecta");
-    	$this->click("//input[@name='scm' and @value='scmsvn']");
+		$this->click("//input[@name='scm' and @value='scmsvn']");
 		$this->click("submit");
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("Your project has been submitted"));
@@ -104,7 +104,7 @@
 		$this->type("purpose", "This is a & été simple description for project B");
 		$this->type("description", "This is & été the public description for project B.");
 		$this->type("unix_name", "projectb");
-    	$this->click("//input[@name='scm' and @value='scmsvn']");
+		$this->click("//input[@name='scm' and @value='scmsvn']");
 		$this->click("submit");
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("Your project has been submitted"));
@@ -121,6 +121,18 @@
 		$this->click("link=Project ' & B");
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("This is & été the public description for project B."));
+
+		$this->click("link=Projects");
+		$this->waitForPageToLoad("30000");
+		$this->click("link=Project Tree");
+		$this->waitForPageToLoad("30000");
+		$this->click("link=Project List");
+		$this->waitForPageToLoad("30000");
+		$this->assertTrue($this->isTextPresent("Project ' & B - This is & été the public description for project B."));
+		$this->click("link=My Page");
+		$this->waitForPageToLoad("30000");
+		$this->click("//div[@id='tabber']/ul/li[5]/a");
+		$this->assertFalse($this->isTextPresent("Project ' &amp; B"));
 	}
 
 	// Test removal of project.
@@ -128,7 +140,7 @@
 	function testRemoveProject()
 	{
 		$this->createProject('testal1');
-		
+
 		$this->click("link=Admin");
 		$this->waitForPageToLoad("30000");
 		$this->click("link=Display Full Project List/Edit Projects");