summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-10-24 09:44:31 +0300
committerLeif Åstrand <leif@vaadin.com>2012-10-24 09:44:31 +0300
commit8e31001c27f47f1bead4f13c4be07615df29993e (patch)
treee40037f2179f6d1f881a3d8ec43ec62744d7a543 /uitest
parentf1546b6285837d9a8a964e6ef6998ad00683c23a (diff)
downloadvaadin-framework-8e31001c27f47f1bead4f13c4be07615df29993e.tar.gz
vaadin-framework-8e31001c27f47f1bead4f13c4be07615df29993e.zip
Test without https and cross domain window.location access (#9859)
Change-Id: I1fcbaa9dcde2cf16b162e21e8fbf519a114bd261
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html6
-rw-r--r--uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java3
2 files changed, 5 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
index f5313c7bec..93f102097a 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
+++ b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
@@ -60,9 +60,9 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
- <td>https://www.google.*/</td>
- <td>https://www.google.*/</td>
+ <td>assertText</td>
+ <td>//h1</td>
+ <td>Index of /download/nightly</td>
</tr>
<!--Open again and verify we get a Session Expired error if doing something after closing the session-->
<tr>
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java
index 0278190084..6f1c05b9c8 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java
@@ -62,7 +62,8 @@ public class CloseSession extends AbstractTestUI {
new Button.ClickListener() {
@Override
public void buttonClick(ClickEvent event) {
- getPage().setLocation("https://www.google.com");
+ getPage().setLocation(
+ "http://vaadin.com/download/nightly/");
getSession().close();
}
}));