]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a4ed78)
Update test to avoid doing cross domain loading 68/168/1
authorLeif Åstrand <leif@vaadin.com>
Fri, 26 Oct 2012 07:11:22 +0000 (10:11 +0300)
committerLeif Åstrand <leif@vaadin.com>
Fri, 26 Oct 2012 07:11:22 +0000 (10:11 +0300)
Change-Id: I168b278d8320b3e7f0346167b7b2dc99bbb136fa

WebContent/statictestfiles/static.html [new file with mode: 0644] patch | blob
uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html patch | blob | history
uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java patch | blob | history

diff --git a/WebContent/statictestfiles/static.html b/WebContent/statictestfiles/static.html
new file mode 100644 (file)
index 0000000..17adf5a
--- /dev/null
+++ b/WebContent/statictestfiles/static.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>This is a static file</title>
+</head>
+<body>
+<h1>This is a static file</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html b/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html
index 93f102097a4c50ce5d641c3806da80f40b103461..99cfededb196ed52db2a5622ee27acb46e823d49 100644 (file)
--- 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 6f1c05b9c8f17bb205217dc38b0755d7121ba31d..bff8af8d37a070a7d1d39a285a64e896623e072d 100644 (file)
--- 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();
                     }
                 }));
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework