aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@gmail.com>2016-12-19 11:43:00 +0200
committerPekka Hyvönen <pekka@vaadin.com>2016-12-19 11:43:00 +0200
commitcf748bf329786ea2d78166dc9f979b006802e124 (patch)
tree45a6e7039eedcdd5dad708db0be2fef158c13854 /uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
parent6bb05cd71d72a7494ca8fb92ece40a5d2476139c (diff)
downloadvaadin-framework-cf748bf329786ea2d78166dc9f979b006802e124.tar.gz
vaadin-framework-cf748bf329786ea2d78166dc9f979b006802e124.zip
Use PhantomJS2 for server integration tests (#8030)
* Run server integration tests with PhantomJS2 * Add delay to integration test screenshots Otherwise, the progress indicator might still be fading when the screenshot is taken, and the screenshots are not fully stable. * Reduce integration test startup delays * Add PhantomJS2 screenshots for integration tests * Add PhantomJS2 screenshots for tomcat 7 proxy test
Diffstat (limited to 'uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java')
-rw-r--r--uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
index d135c79347..3a7f907354 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
@@ -27,9 +27,9 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.tests.tb3.PrivateTB3Configuration;
+import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-public class JSPIntegrationTest extends PrivateTB3Configuration {
+public class JSPIntegrationTest extends SingleBrowserTestPhantomJS2 {
final String appRunnerTestUrl = getBaseURL() + "/run/Buttons";
final String jspUrl = getBaseURL() + "/statictestfiles/vaadinsessions.jsp";