diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-10-26 10:11:22 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-10-26 10:11:22 +0300 |
| commit | 2c71479818e6a75cd75dc9d86debc6cf6b9997db (patch) | |
| tree | a3db4245769147f89dc4008b0b8f259f5388ee0e | |
| parent | 1a4ed78eb700fb6c64dcfa83098e72c6be2c6800 (diff) | |
| download | vaadin-framework-2c71479818e6a75cd75dc9d86debc6cf6b9997db.tar.gz vaadin-framework-2c71479818e6a75cd75dc9d86debc6cf6b9997db.zip | |
Update test to avoid doing cross domain loading
Change-Id: I168b278d8320b3e7f0346167b7b2dc99bbb136fa
3 files changed, 11 insertions, 3 deletions
diff --git a/WebContent/statictestfiles/static.html b/WebContent/statictestfiles/static.html new file mode 100644 index 0000000000..17adf5aaba --- /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 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(); } })); |