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 bda74864adec88e6760a66ace6c822ce8184c6ab..cbf995f207dc8f10fce470edaab53a05d8891a45 100644 (file)
--- 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}" />\r
                        <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />\r
                        <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />\r
+                       <property name="server.start.succeeded" value="1" />\r
                        <property name="browsers" value="${test_browsers}" />\r
                        <property name="testfiles" value="${testfiles}" />\r
                        <property name="test-output-dir" value="../build/integration-test-output" />\r

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index e2615952e891f2a450c9f0201054f83e82234b64..50b95bfdc288496ba25690c7a4dcfdb12bfdc3c0 100644 (file)
--- 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>