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 f5313c7becb1e29f7f2df3db3e7f30f00b9b882d..93f102097a4c50ce5d641c3806da80f40b103461 100644 (file)
--- 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 0278190084446fd85927fa53b3d27ef168b4b2a1..6f1c05b9c8f17bb205217dc38b0755d7121ba31d 100644 (file)
--- 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();
                     }
                 }));