Merge "Update test to avoid doing cross domain loading"

2 files changed, 3 insertions, 3 deletions

diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
index 93f102097a..99cfededb1 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
+++ b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
@@ -62,7 +62,7 @@
 <tr>
 	<td>assertText</td>
 	<td>//h1</td>
-	<td>Index of /download/nightly</td>
+	<td>This is a static file</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 6f1c05b9c8..bff8af8d37 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java
@@ -62,8 +62,8 @@ public class CloseSession extends AbstractTestUI {
                 new Button.ClickListener() {
                     @Override
                     public void buttonClick(ClickEvent event) {
-                        getPage().setLocation(
-                                "http://vaadin.com/download/nightly/");
+                        // Assuming Vaadin is deployed to the root context
+                        getPage().setLocation("/statictestfiles/static.html");
                         getSession().close();
                     }
                 }));