chore: Upgrade Flow and Vaadin versions used (#1720)

vaadin · Feb 1, 2024 · a57fc29 · a57fc29
1 parent 29e0871
commit a57fc29
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ driver
 types.d.ts
 tsconfig.json
 webpack.*
+vite.*.ts
 node_modules
 .driver
 package*json

diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <Implementation-Version>${project.version}</Implementation-Version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <vaadin.version>23.4-SNAPSHOT</vaadin.version>
+        <flow.version>${vaadin.version}</flow.version>
         <selenium.version>4.17.0</selenium.version>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>

diff --git a/vaadin-testbench-core/src/test/java/com/vaadin/testbench/IPAddressTest.java b/vaadin-testbench-core/src/test/java/com/vaadin/testbench/IPAddressTest.java
@@ -19,9 +19,10 @@ public void siteLocalAddress() {
         // address...
         try {
             String address = IPAddress.findSiteLocalAddress();
-            Assert.assertTrue(
-                    address.startsWith("10.") || address.startsWith("172.16.")
-                            || address.startsWith("192.168."));
+            Assert.assertTrue(address.startsWith("10.")
+                    // 172.16.0.0/12 IP addresses: 172.16.0.0 – 172.31.255.255
+                    || address.matches("172\\.(1[6-9]|2[0-9]|3[0-1])\\..*")
+                    || address.startsWith("192.168."));
         } catch (RuntimeException e) {
             Assert.assertEquals(
                     "No compatible (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16) IP address found.",

diff --git a/...n-testbench-core/src/test/java/com/vaadin/testbench/parallel/JobNameCapabilitiesTest.java b/...n-testbench-core/src/test/java/com/vaadin/testbench/parallel/JobNameCapabilitiesTest.java
@@ -32,9 +32,11 @@ public void tbMethodNameInCapabilities() throws InitializationError {
             DesiredCapabilities cap = ((TBMethod) testMethod).getCapabilities();
             Assert.assertEquals("bar",
                     SauceLabsIntegration.getSauceLabsOption(cap, "foo"));
-            Assert.assertEquals(testMethod.getName(),
-                    SauceLabsIntegration.getSauceLabsOption(cap,
-                            SauceLabsIntegration.CapabilityType.NAME));
+            if (SauceLabsIntegration.isConfiguredForSauceLabs()) {
+                Assert.assertEquals(testMethod.getName(),
+                        SauceLabsIntegration.getSauceLabsOption(cap,
+                                SauceLabsIntegration.CapabilityType.NAME));
+            }
         }
     }
 

diff --git a/vaadin-testbench-integration-tests/frontend/template-view.ts b/vaadin-testbench-integration-tests/frontend/template-view.ts
@@ -1,5 +1,5 @@
 import { html, LitElement } from 'lit';
-import { customElement } from 'lit/decorators';
+import { customElement } from 'lit/decorators.js';
 
 @customElement("template-view")
 export class TemplateView extends LitElement {

diff --git a/vaadin-testbench-integration-tests/pom.xml b/vaadin-testbench-integration-tests/pom.xml
@@ -16,8 +16,7 @@
 
     <url>http://maven.apache.org</url>
     <properties>
-        <jetty.version>9.4.43.v20210629</jetty.version>
-        <flow.version>9.0-SNAPSHOT</flow.version>
+        <jetty.version>10.0.13</jetty.version>
     </properties>
     <repositories>
         <repository>
@@ -109,9 +108,6 @@
                 <groupId>com.vaadin</groupId>
                 <artifactId>flow-maven-plugin</artifactId>
                 <version>${flow.version}</version>
-                <configuration>
-                    <bowerMode>true</bowerMode>
-                </configuration>
                 <executions>
                     <execution>
                         <goals>

diff --git a/vaadin-testbench-unit/pom.xml b/vaadin-testbench-unit/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <kotlin.version>1.6.21</kotlin.version>
         <dokka.version>1.6.21</dokka.version>
-        <vaadin.version>23.2-SNAPSHOT</vaadin.version>
         <junit5.version>5.8.2</junit5.version>
     </properties>
 

diff --git a/vaadin-testbench-unit/src/main/java/com/vaadin/flow/component/details/DetailsTester.java b/vaadin-testbench-unit/src/main/java/com/vaadin/flow/component/details/DetailsTester.java
@@ -85,8 +85,6 @@ private void setOpened(boolean opened) {
                     "Details are already " + (opened ? "open" : "close"));
         }
         component.setOpened(opened);
-        ComponentUtil.fireEvent(component,
-                new Details.OpenedChangeEvent(component, false));
     }
 
 }
diff --git a/...n-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/ComponentUtilsTest.kt b/...n-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/ComponentUtilsTest.kt
@@ -65,13 +65,13 @@ fun DynaNodeGroup.componentUtilsTests() {
 
     test("tooltip") {
         val b = Button()
-        expect(null) { b.tooltip }
-        b.tooltip = ""
-        expect<String?>("") { b.tooltip } // https://youtrack.jetbrains.com/issue/KT-32501
-        b.tooltip = "foo"
-        expect<String?>("foo") { b.tooltip } // https://youtrack.jetbrains.com/issue/KT-32501
-        b.tooltip = null
-        expect(null) { b.tooltip }
+        expect(null) { b.tooltip.text }
+        b.setTooltipText("")
+        expect<String?>("") { b.tooltip.text } // https://youtrack.jetbrains.com/issue/KT-32501
+        b.setTooltipText("foo")
+        expect<String?>("foo") { b.tooltip.text } // https://youtrack.jetbrains.com/issue/KT-32501
+        b.setTooltipText(null)
+        expect(null) { b.tooltip.text }
     }
 
     test("addContextMenuListener smoke") {

diff --git a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/MockVaadinTest.kt b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/MockVaadinTest.kt
@@ -71,7 +71,6 @@ internal fun DynaNodeGroup.mockVaadinTest() {
             expect(true) { VaadinSession.getCurrent().browser.locale != null }
             expect(false) { VaadinSession.getCurrent().browser.isIPhone }
             expect(true) { VaadinSession.getCurrent().browser.isFirefox }
-            expect(false) { VaadinSession.getCurrent().browser.isTooOldToFunctionProperly }
             expect(false) { VaadinSession.getCurrent().browser.isChrome }
             expect(false) { VaadinSession.getCurrent().browser.isChromeOS }
             expect(false) { VaadinSession.getCurrent().browser.isAndroid }