[gatein-commits] gatein SVN: r2865 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

Wed Apr 28 06:04:57 EDT 2010

Author: hangnguyen
Date: 2010-04-28 06:04:55 -0400 (Wed, 28 Apr 2010)
New Revision: 2865

Modified:
   portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html
Log:
Testvn-356 : Resolve conflict

Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html
===================================================================

--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html	2010-04-28 10:03:21 UTC (rev 2864)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_006_CreateNewNodeInTheFirstLevel.html	2010-04-28 10:04:55 UTC (rev 2865)
@@ -4,14 +4,19 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>Test_POR_14_01_006</title>
+<title>Test_POR_14_01_006_CreateNewNodeInTheFirstLevel</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">Test_POR_14_01_006</td></tr>
+<tr><td rowspan="1" colspan="3">Test_POR_14_01_006_CreateNewNodeInTheFirstLevel</td></tr>
 </thead><tbody>
 <tr>
+	<td></td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
 	<td>open</td>
 	<td>/portal/public/classic</td>
 	<td></td>
@@ -42,16 +47,21 @@
 	<td>gtn</td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>clickAt</td>
 	<td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>waitForElementPresent</td>
 	<td>link=Group</td>
 	<td></td>
 </tr>
 <tr>
+	<td>clickAt</td>
+	<td>link=Group</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Edit Navigation</td>
 	<td></td>
@@ -122,6 +132,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>echo</td>
+	<td>https://jira.jboss.org/jira/browse/GTNPORTAL-1129</td>
+	<td></td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
 	<td>link=Save</td>
 	<td></td>
@@ -212,10 +227,25 @@
 	<td></td>
 </tr>
 <tr>
+	<td>echo</td>
+	<td>--Sign out--</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Sign out</td>
+	<td></td>
+</tr>
+<tr>
 	<td>clickAt</td>
 	<td>link=Sign out</td>
 	<td></td>
 </tr>
+<tr>
+	<td></td>
+	<td></td>
+	<td></td>
+</tr>
 
 </tbody></table>
 </body>

