From c7e2e430c8f28dac13c9653bde8b9e8c190f5c01 Mon Sep 17 00:00:00 2001
From: Marco Collovati <mcollovati@gmail.com>
Date: Thu, 24 Sep 2020 23:34:58 +0200
Subject: [PATCH] Fixed tests

---
 .../vertx-vaadin-tests/pom.xml                | 24 +++++++++++++++++++
 .../TemplateHasInjectedSubTemplateView.java   |  2 +-
 .../ui/template/TemplateScalabilityPanel.java |  2 +-
 .../ui/template/TemplateScalabilityView.java  |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/vertx-vaadin-flow-parent/vertx-vaadin-tests/pom.xml b/vertx-vaadin-flow-parent/vertx-vaadin-tests/pom.xml
index 8c6826e6..dae1c312 100644
--- a/vertx-vaadin-flow-parent/vertx-vaadin-tests/pom.xml
+++ b/vertx-vaadin-flow-parent/vertx-vaadin-tests/pom.xml
@@ -26,11 +26,25 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-bom</artifactId>
+                <version>${vaadin.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!--
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>flow-server</artifactId>
+                <version>${vaadin.flow.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>flow-server-production-mode</artifactId>
                 <version>${vaadin.flow.version}</version>
             </dependency>
+            -->
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-testbench-core</artifactId>
@@ -64,6 +78,16 @@
             <artifactId>vaadin-flow-sockjs</artifactId>
             <version>${vertx-vaadin-flow.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin</groupId>
+                    <artifactId>flow-push</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
diff --git a/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateHasInjectedSubTemplateView.java b/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateHasInjectedSubTemplateView.java
index 64dac8ef..1177fd11 100644
--- a/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateHasInjectedSubTemplateView.java
+++ b/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateHasInjectedSubTemplateView.java
@@ -33,7 +33,7 @@ public class TemplateHasInjectedSubTemplateView
 
     @Tag("injected-child")
     @HtmlImport("frontend://com/vaadin/flow/uitest/ui/template/InjectedChild.html")
-    @JsModule("./InjectedChild.js")
+    @JsModule("InjectedChild.js")
     public static class InjectedChild extends PolymerTemplate<Message> {
         @Override
         protected Message getModel() {
diff --git a/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityPanel.java b/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityPanel.java
index 035720e8..5c829a20 100644
--- a/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityPanel.java
+++ b/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityPanel.java
@@ -25,7 +25,7 @@
 
 @Tag("template-scalability-panel")
 @HtmlImport("frontend://com/vaadin/flow/uitest/ui/template/template-scalability-panel.html")
-@JsModule("./template-scalability-panel.js")
+@JsModule("template-scalability-panel.js")
 public class TemplateScalabilityPanel extends PolymerTemplate<TemplateModel> {
 
     @Id("ack-btn")
diff --git a/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityView.java b/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityView.java
index cf4c05e0..e8f486c7 100644
--- a/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityView.java
+++ b/vertx-vaadin-flow-parent/vertx-vaadin-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/template/TemplateScalabilityView.java
@@ -32,7 +32,7 @@
  */
 @Tag("template-scalability-view")
 @HtmlImport("frontend://com/vaadin/flow/uitest/ui/template/template-scalability-view.html")
-@JsModule("./template-scalability-view.js")
+@JsModule("template-scalability-view.js")
 @Route(value = "com.vaadin.flow.uitest.ui.template.TemplateScalabilityView")
 @PageTitle("Template scalability")
 public class TemplateScalabilityView extends PolymerTemplate<TemplateModel> implements