aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/vaadin/tests/components/caption/LargeCaptionIcon.html10
-rw-r--r--tests/scripts/demos-except-sampler.html77
-rw-r--r--tests/scripts/sampler-all-samples.html11
-rw-r--r--tests/scripts/vaadin.com-test.html147
4 files changed, 211 insertions, 34 deletions
diff --git a/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index 61a014c975..d2928cf4c3 100644
--- a/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
@@ -17,6 +17,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
<td>screenCapture</td>
<td></td>
<td></td>
@@ -27,6 +32,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
<td>screenCapture</td>
<td></td>
<td></td>
diff --git a/tests/scripts/demos-except-sampler.html b/tests/scripts/demos-except-sampler.html
index d534a8a0b9..c4ddcd15c2 100644
--- a/tests/scripts/demos-except-sampler.html
+++ b/tests/scripts/demos-except-sampler.html
@@ -12,29 +12,29 @@
<tr><td rowspan="1" colspan="3">demos-except-sampler</td></tr>
</thead><tbody>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<!--Removed Reservr test as the google maps "invalid key" alert box cannot be handled -->
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>link=VaadinTunes – advanced layout &amp; theme</td>
<td>134,11</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<tr>
<td>pause</td>
- <td>500</td>
+ <td>1000</td>
<td></td>
</tr>
<tr>
@@ -43,28 +43,28 @@
<td></td>
</tr>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>link=Coverflow – Flex integration</td>
<td>96,11</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
- <td></td>
+ <td>pause</td>
+ <td>1000</td>
<td></td>
</tr>
<tr>
- <td>pause</td>
- <td>2000</td>
+ <td>waitForVaadin</td>
+ <td></td>
<td></td>
</tr>
<tr>
@@ -78,28 +78,28 @@
<td></td>
</tr>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>link=Reindeer theme – see available styles</td>
<td>88,9</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
- <td></td>
+ <td>pause</td>
+ <td>1000</td>
<td></td>
</tr>
<tr>
- <td>pause</td>
- <td>500</td>
+ <td>waitForVaadin</td>
+ <td></td>
<td></td>
</tr>
<tr>
@@ -113,22 +113,27 @@
<td></td>
</tr>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>link=Hello world</td>
<td>36,8</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
@@ -143,22 +148,27 @@
<td></td>
</tr>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>link=Calculator</td>
<td>49,2</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
@@ -208,22 +218,27 @@
<td></td>
</tr>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>link=Colorpicker – creating new widgets</td>
<td>61,9</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
diff --git a/tests/scripts/sampler-all-samples.html b/tests/scripts/sampler-all-samples.html
index 1a62b8061f..5bb6b1e885 100644
--- a/tests/scripts/sampler-all-samples.html
+++ b/tests/scripts/sampler-all-samples.html
@@ -12,7 +12,7 @@
<tr><td rowspan="1" colspan="3">sampler-all-samples</td></tr>
</thead><tbody>
<tr>
- <td>open</td>
+ <td>openAndWait</td>
<td>/</td>
<td></td>
</tr>
@@ -22,12 +22,17 @@
<td></td>
</tr>
<tr>
- <td>mouseClick</td>
+ <td>mouseClickAndWait</td>
<td>//div[@id='sampler']/a/strong</td>
<td>96,14</td>
</tr>
<tr>
- <td>waitForVaadinAndWait</td>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
<td></td>
<td></td>
</tr>
diff --git a/tests/scripts/vaadin.com-test.html b/tests/scripts/vaadin.com-test.html
new file mode 100644
index 0000000000..2f1ed6c74e
--- /dev/null
+++ b/tests/scripts/vaadin.com-test.html
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<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://vaadin.com/" />
+<title>vaadin.com-test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">vaadin.com-test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Demo</td>
+ <td>39,27</td>
+</tr>
+<tr>
+ <td>waitForVaadinAndWait</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Download</td>
+ <td>48,24</td>
+</tr>
+<tr>
+ <td>waitForVaadinAndWait</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Learn</td>
+ <td>24,32</td>
+</tr>
+<tr>
+ <td>waitForVaadinAndWait</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Discuss</td>
+ <td>40,25</td>
+</tr>
+<tr>
+ <td>waitForVaadinAndWait</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Contribute</td>
+ <td>42,24</td>
+</tr>
+<tr>
+ <td>waitForVaadinAndWait</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Pro</td>
+ <td>29,29</td>
+</tr>
+<tr>
+ <td>waitForVaadinAndWait</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>