From 2c71479818e6a75cd75dc9d86debc6cf6b9997db Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 26 Oct 2012 10:11:22 +0300 Subject: Update test to avoid doing cross domain loading Change-Id: I168b278d8320b3e7f0346167b7b2dc99bbb136fa --- WebContent/statictestfiles/static.html | 8 ++++++++ uitest/src/com/vaadin/tests/applicationcontext/CloseSession.html | 2 +- uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 WebContent/statictestfiles/static.html 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 @@ + + +This is a static file + + +

This is a static file

+ + \ 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 @@ assertText //h1 - Index of /download/nightly + This is a static file 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(); } })); -- cgit v1.2.3