[Fusionforge-commits] r8688 - in trunk: gforge/www/tracker/admin tests/func/Trackers

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Mon Jan 25 21:26:53 CET 2010


Author: aljeux
Date: 2010-01-25 21:26:52 +0100 (Mon, 25 Jan 2010)
New Revision: 8688

Modified:
   trunk/gforge/www/tracker/admin/form-addextrafield.php
   trunk/tests/func/Trackers/trackers.php
   trunk/tests/func/Trackers/workflow.php
Log:
Update tests on trackers

Modified: trunk/gforge/www/tracker/admin/form-addextrafield.php
===================================================================
--- trunk/gforge/www/tracker/admin/form-addextrafield.php	2010-01-25 13:37:24 UTC (rev 8687)
+++ trunk/gforge/www/tracker/admin/form-addextrafield.php	2010-01-25 20:26:52 UTC (rev 8688)
@@ -27,7 +27,7 @@
 
 			for ($k=0; $k < $rows; $k++) {
 				$i=$keys[$k];
-				echo '<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'.
+				echo '<tr id="field-'.$efarr[$i]['alias'].'" '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'.
 					'<td>'.$efarr[$i]['field_name'].(($efarr[$i]['is_required']) ? utils_requiredField() : '').'<a href="'.getStringFromServer('PHP_SELF').'?update_box=1&amp;id='.
 						$efarr[$i]['extra_field_id'].'&amp;group_id='.$group_id.'&amp;atid='. $ath->getID() .'">'.
 						' ['._('Edit').']</a>'.
@@ -51,14 +51,14 @@
 					for ($j=0; $j <$optrows; $j++)
 					{
 						echo $elearray[$j]['element_name'];				
-						echo '<a href="'.getStringFromServer('PHP_SELF').'?update_opt=1&amp;id='.
+						echo ' <a href="'.getStringFromServer('PHP_SELF').'?update_opt=1&amp;id='.
 						$elearray[$j]['element_id'].'&amp;group_id='.$group_id.'&amp;atid='. $ath->getID() .'&amp;boxid='.
 						$efarr[$i]['extra_field_id'].'">'.
-						' ['._('Edit').']</a>';
-						echo '<a href="'.getStringFromServer('PHP_SELF').'?delete_opt=1&amp;id='.
+						'['._('Edit').']</a>';
+						echo ' <a href="'.getStringFromServer('PHP_SELF').'?delete_opt=1&amp;id='.
 						$elearray[$j]['element_id'].'&amp;group_id='.$group_id.'&amp;atid='. $ath->getID() .'&amp;boxid='.
 						$efarr[$i]['extra_field_id'].'">'.
-						' ['._('Delete').']</a>';
+						'['._('Delete').']</a>';
 						echo '<br />';
 					}
 				} else {
@@ -77,7 +77,7 @@
 						_('add choices').']</a>';
 				}
 				echo '</td>'; 
-			        echo   '</tr>';
+			        echo   '</tr>'."\n";
 			}
 			echo $GLOBALS['HTML']->listTableBottom();
 			

Modified: trunk/tests/func/Trackers/trackers.php
===================================================================
--- trunk/tests/func/Trackers/trackers.php	2010-01-25 13:37:24 UTC (rev 8687)
+++ trunk/tests/func/Trackers/trackers.php	2010-01-25 20:26:52 UTC (rev 8688)
@@ -161,12 +161,12 @@
 
 		// Testing [#3649]: 0 not accepted when modifying a select list value
 		$this->open(BASE."/tracker/admin/index.php?group_id=6&atid=101&add_extrafield=1");
-		$this->click("link=0 [Edit]");
+		$this->click("//tr[@id='field-number']/td[3]/a[5]");
 		$this->waitForPageToLoad("30000");
 		$this->type("name", "10");
 		$this->click("post_changes");
 		$this->waitForPageToLoad("30000");
-		$this->click("link=10 [Edit]");
+		$this->click("//tr[@id='field-number']/td[3]/a[5]");
 		$this->waitForPageToLoad("30000");
 		$this->type("name", "0");
 		$this->click("post_changes");

Modified: trunk/tests/func/Trackers/workflow.php
===================================================================
--- trunk/tests/func/Trackers/workflow.php	2010-01-25 13:37:24 UTC (rev 8687)
+++ trunk/tests/func/Trackers/workflow.php	2010-01-25 20:26:52 UTC (rev 8688)
@@ -68,14 +68,14 @@
 		$this->click("document.forms[2].field_type[6]");
 		$this->click("post_changes");
 		$this->waitForPageToLoad("30000");
-		$this->click("link=Open [Edit]");
+		$this->click("//tr[@id='field-mystatus']/td[3]/a[1]");
 		$this->waitForPageToLoad("30000");
 		$this->type("name", "New");
 		$this->click("post_changes");
 		$this->waitForPageToLoad("30000");
 		$this->click("link=Manage Custom Fields");
 		$this->waitForPageToLoad("30000");
-		$this->click("link=Closed [Edit]");
+		$this->click("//tr[@id='field-mystatus']/td[3]/a[3]");
 		$this->waitForPageToLoad("30000");
 		$this->type("name", "Analyse");
 		$this->select("status_id", "label=Open");




More information about the Fusionforge-commits mailing list