Author: hangnguyen
Date: 2010-04-28 06:03:21 -0400 (Wed, 28 Apr 2010)
New Revision: 2864
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html
Log:
Testvn-356 : Resolve conflict
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html
===================================================================
---
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-04-28
09:57:15 UTC (rev 2863)
+++
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-04-28
10:03:21 UTC (rev 2864)
@@ -4,12 +4,12 @@
<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="http://localhost:8080/portal"
/>
-<title>dung_editPageOfNode</title>
+<title>Test_SNF_PRL_25_EditPageOfNode</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
-<tr><td rowspan="1"
colspan="3">dung_editPageOfNode</td></tr>
+<tr><td rowspan="1"
colspan="3">Test_SNF_PRL_25_EditPageOfNode</td></tr>
</thead><tbody>
<tr>
<td>open</td>
@@ -77,11 +77,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>xpath=/organization/management/executive-board <br /> <br />
<br /> <br /> <br /> <br /> <br /> <br /> <br />
<br /> Add new Node <br /> Paste Node <br /> <br /> <br />
<br /> <br /> <br /> <br /> <br /> <br /> <br />
<br /> <br /> <br /> <br /> <br /> <br /> Add new Node
<br /> Edit Node's Page <br /> Edit this Node <br /> Copy Node
<br /> Clone Node <br /> Cut Node <br /> Delete Node <br /> Move
Up <br /> Move Down <br /> <br /> <br /> <br /> <br />
<br /> <br /> <br /> <br /> <br /> <br /> Organization
<br /> <br /> node25 <br /> <br /> <br /> <br />
<br /> <br /> <br /> <br /> <br /> <br /> <br />
<br /> <br /> <br /> <br /> Add Node <br /> <br />
<br /> <br /> Save</td>
- <td></td>
-</tr>
-<tr>
<td>clickAt</td>
<td>link=Add Node</td>
<td></td>
@@ -143,7 +138,7 @@
</tr>
<tr>
<td>echo</td>
- <td>--- OK den doan nay</td>
+ <
td>https://jira.jboss.org/jira/browse/GTNPORTAL-1128</td>
<td></td>
</tr>
<tr>