diff --git a/.gitignore b/.gitignore index c5b66188c..6712e0ff6 100644 --- 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 index cec448a10..1b950b37f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,8 @@ UTF-8 ${project.version} UTF-8 + 23.4-SNAPSHOT + ${vaadin.version} 4.17.0 11 11 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 index 839bb0827..c02f8b0bb 100644 --- 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/vaadin-testbench-core/src/test/java/com/vaadin/testbench/parallel/JobNameCapabilitiesTest.java b/vaadin-testbench-core/src/test/java/com/vaadin/testbench/parallel/JobNameCapabilitiesTest.java index 61312933d..b91736911 100644 --- a/vaadin-testbench-core/src/test/java/com/vaadin/testbench/parallel/JobNameCapabilitiesTest.java +++ b/vaadin-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 index 38d4b25b8..1deeb2700 100644 --- 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 index f95a6b255..f40a7d487 100644 --- a/vaadin-testbench-integration-tests/pom.xml +++ b/vaadin-testbench-integration-tests/pom.xml @@ -16,8 +16,7 @@ http://maven.apache.org - 9.4.43.v20210629 - 9.0-SNAPSHOT + 10.0.13 @@ -109,9 +108,6 @@ com.vaadin flow-maven-plugin ${flow.version} - - true - diff --git a/vaadin-testbench-unit/pom.xml b/vaadin-testbench-unit/pom.xml index c1173e76a..65a2c7c80 100644 --- a/vaadin-testbench-unit/pom.xml +++ b/vaadin-testbench-unit/pom.xml @@ -30,7 +30,6 @@ 1.6.21 1.6.21 - 23.2-SNAPSHOT 5.8.2 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 index 37f34e034..b97457493 100644 --- 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/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/ComponentUtilsTest.kt b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/ComponentUtilsTest.kt index 8cea62b35..e9e267b4c 100644 --- a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/ComponentUtilsTest.kt +++ b/vaadin-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("") { b.tooltip } // https://youtrack.jetbrains.com/issue/KT-32501 - b.tooltip = "foo" - expect("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("") { b.tooltip.text } // https://youtrack.jetbrains.com/issue/KT-32501 + b.setTooltipText("foo") + expect("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 index e50f16210..affc7fdf1 100644 --- 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 }