Fix tests and build

parttio · Aug 22, 2019 · 5078b09 · 5078b09
1 parent 4285e9b
commit 5078b09
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 70 deletions.
diff --git a/pom.xml b/pom.xml
@@ -204,7 +204,7 @@ Guava conflict forces not to use Reflections in ApplicationServiceInitListener.j
                     <stopPort>9966</stopPort>
                     <stopKey>STOP</stopKey>
                 </configuration>
-                <executions>
+				<executions>
                     <execution>
                         <id>start-jetty</id>
                         <phase>pre-integration-test</phase>
@@ -237,7 +237,6 @@ Guava conflict forces not to use Reflections in ApplicationServiceInitListener.j
                     <execution>
                         <goals>
                             <goal>prepare-frontend</goal>
-                            <goal>build-frontend</goal>
                         </goals>
                     </execution>
                 </executions>

diff --git a/src/test/java/org/vaadin/textfieldformatter/AbstractTest.java b/src/test/java/org/vaadin/textfieldformatter/AbstractTest.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.Route;
 
-@Route(registerAtStartup = false)
+@Route(layout = MainView.class)
 public abstract class AbstractTest extends VerticalLayout {
 
 	public AbstractTest() {

diff --git a/src/test/java/org/vaadin/textfieldformatter/ApplicationServiceInitListener.java b/src/test/java/org/vaadin/textfieldformatter/ApplicationServiceInitListener.java
diff --git a/...vaadin/textfieldformatter/MainLayout.java → ...g/vaadin/textfieldformatter/MainView.java b/...vaadin/textfieldformatter/MainLayout.java → ...g/vaadin/textfieldformatter/MainView.java
@@ -12,14 +12,14 @@
 import com.vaadin.flow.theme.Theme;
 import com.vaadin.flow.theme.lumo.Lumo;
 
-@Route("")
+@Route
 @Theme(Lumo.class)
-public class MainLayout extends HorizontalLayout implements RouterLayout {
+public class MainView extends HorizontalLayout implements RouterLayout {
 
 	private VerticalLayout menu;
 	private HasElement content;
 
-	public MainLayout() {
+	public MainView() {
 		menu = new VerticalLayout();
 		menu.setSpacing(true);
 		menu.setMargin(true);

diff --git a/src/test/java/org/vaadin/textfieldformatter/it/AbstractCustomTestBenchTestCase.java b/src/test/java/org/vaadin/textfieldformatter/it/AbstractCustomTestBenchTestCase.java
@@ -1,17 +1,21 @@
 package org.vaadin.textfieldformatter.it;
 
-import org.junit.After;
+import org.junit.Rule;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.vaadin.textfieldformatter.AbstractTest;
 
+import com.vaadin.testbench.ScreenshotOnFailureRule;
 import com.vaadin.testbench.TestBenchTestCase;
 
 public abstract class AbstractCustomTestBenchTestCase extends TestBenchTestCase {
 	protected static final int TESTPORT = 8080;
 	protected static final String BASEURL = "http://localhost:" + TESTPORT + "/";
 
+	@Rule
+	public ScreenshotOnFailureRule screenshotOnFailure = new ScreenshotOnFailureRule(this, true);
+
 	public AbstractCustomTestBenchTestCase() {
 		super();
 	}
@@ -34,13 +38,6 @@ protected void startBrowser(WebDriver driver) {
 	}
 
 	protected <T extends AbstractTest> void openUI(Class<T> testClass) {
-		driver.navigate().to(BASEURL + testClass.getSimpleName());
-	}
-
-	@After
-	public void teardown() {
-		if (driver != null) {
-			driver.quit();
-		}
+		driver.get(BASEURL + testClass.getSimpleName().toLowerCase());
 	}
 }
diff --git a/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener b/src/test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener
diff --git a/webdrivers.xml b/webdrivers.xml
@@ -2,32 +2,32 @@
 <root>
     <windows>
          <driver id="googlechrome">
-            <version id="74.0.3729.6">
+            <version id="76.0.3809.126">
                 <bitrate thirtytwobit="true" sixtyfourbit="true">
-                    <filelocation>http://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_win32.zip</filelocation>
-                    <hash>fbc10cbc20da67246e2da89c4763a2fb2671ee71</hash>
+                    <filelocation>http://chromedriver.storage.googleapis.com/76.0.3809.126/chromedriver_win32.zip</filelocation>
+                    <hash>4b673be1bce27e9177e42027ba08a54b704270fd</hash>
                     <hashtype>sha1</hashtype>
                 </bitrate>
             </version>
         </driver>
     </windows>
     <linux>
         <driver id="googlechrome">
-            <version id="74.0.3729.6">
+            <version id="76.0.3809.126">
                 <bitrate sixtyfourbit="true">
-                    <filelocation>https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip</filelocation>
-                    <hash>848a3689d5846eb1b2d5e0d745bb5adf655430ae</hash>
+                    <filelocation>https://chromedriver.storage.googleapis.com/76.0.3809.126/chromedriver_linux64.zip</filelocation>
+                    <hash>632683aa20c8af87a06ae8a87c915c0b4dfcf89b</hash>
                     <hashtype>sha1</hashtype>
                 </bitrate>
             </version>
         </driver>
     </linux>
     <osx>
         <driver id="googlechrome">
-            <version id="74.0.3729.6">
+            <version id="76.0.3809.126">
                 <bitrate sixtyfourbit="true">
-                    <filelocation>https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_mac64.zip</filelocation>
-                    <hash>d13d083807beb828694045fd56a99cf4a605060d</hash>
+                    <filelocation>https://chromedriver.storage.googleapis.com/76.0.3809.126/chromedriver_mac64.zip</filelocation>
+                    <hash>f7e417258e9eb8b405dfb782346d7aa3380fde97</hash>
                     <hashtype>sha1</hashtype>
                 </bitrate>
             </version>