Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade Flow and Vaadin versions used #1720

Merged
merged 1 commit into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ driver
types.d.ts
tsconfig.json
webpack.*
vite.*.ts
node_modules
.driver
package*json
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 1 addition & 5 deletions vaadin-testbench-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion vaadin-testbench-unit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down