summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-02-27 13:06:22 +0200
committerArtur Signell <artur@vaadin.com>2014-02-27 13:06:22 +0200
commitca9f91d8b537f5cf3e0694cbb538052c2a25f608 (patch)
tree2634d76b245fa6958ed5e3a2632f730b0b74d988 /uitest
parent3be432631760acbe8c7972bf76b16341c55735ef (diff)
parentbce95bce91f80ddd228c96ab7b89770499b5e49e (diff)
downloadvaadin-framework-ca9f91d8b537f5cf3e0694cbb538052c2a25f608.tar.gz
vaadin-framework-ca9f91d8b537f5cf3e0694cbb538052c2a25f608.zip
Merge commit 'bce95bce91f80ddd228c96ab7b89770499b5e49e'
Conflicts: uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html Change-Id: I03b12e474ee59a86aefcedfda24e55620eed717d
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html b/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
index 7c6f9ceb39..48d48ede80 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<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:88888/" />
+<link rel="selenium.base" href="" />
<title>IntegerRangeValidator</title>
</head>
<body>
@@ -90,7 +90,6 @@
<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VTooltip[0]/FlowPanel[0]/VErrorMessage[0]/HTML[0]</td>
<td>Must be between 0 and 150, -1 is not</td>
</tr>
-
</tbody></table>
</body>
</html>