From: Artur Signell <artur.signell@itmill.com>
Date: Wed, 16 Jun 2010 13:57:57 +0000 (+0000)
Subject: Merged test relates fixes from 6.3
X-Git-Tag: 6.7.0.beta1~1579
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=09904e75ed20e87090ebc18ab5e1384a1a5ccc99;p=vaadin-framework.git

Merged test relates fixes from 6.3

svn changeset:13715/svn branch:6.4
---

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index bda74864ad..cbf995f207 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -46,6 +46,7 @@
 			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
 			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
 			<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
+			<property name="server.start.succeeded" value="1" />
 			<property name="browsers" value="${test_browsers}" />
 			<property name="testfiles" value="${testfiles}" />
 			<property name="test-output-dir" value="../build/integration-test-output" />
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index e2615952e8..50b95bfdc2 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxReapperingOldValue::/VVerticalLayout[0]</td>
 	<td>10,15</td>
 </tr>
 <tr>
@@ -106,17 +106,11 @@
 	<td></td>
 	<td></td>
 </tr>
-<tr>
-	<td>pause</td>
-	<td>200</td>
-	<td></td>
-</tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>