From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 24 Oct 2012 06:44:31 +0000 (+0300)
Subject: Test without https and cross domain window.location access (#9859)
X-Git-Tag: 7.0.0.beta6~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F153%2F1;p=vaadin-framework.git

Test without https and cross domain window.location access (#9859)

Change-Id: I1fcbaa9dcde2cf16b162e21e8fbf519a114bd261
---

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();
                     }
                 }));