Merge branch 'master' into fix/vite-import-css-ts

flow-tests/test-ccdm-flow-navigation/pom.xml

@@ -14,6 +14,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <failsafe.argLine>-Dvaadin.test.developmentMode=true</failsafe.argLine>
     </properties>
 
     <dependencies>
@@ -50,20 +51,6 @@
                     <productionMode>false</productionMode>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty.version}</version>
-                <configuration>
-                    <systemProperties>
-                        <!--
-                        Disable dev tools to avoid page reloads caused by debug window
-                        See https://github.com/vaadin/flow/issues/13116
-                        -->
-                        <vaadin.devmode.devTools.enabled>false</vaadin.devmode.devTools.enabled>
-                    </systemProperties>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

flow-tests/test-ccdm-flow-navigation/src/main/java/com/vaadin/flow/navigate/ReconnectIntervalConfigurer.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2022 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.flow.navigate;
+
+import com.vaadin.flow.server.ServiceInitEvent;
+import com.vaadin.flow.server.VaadinServiceInitListener;
+
+/**
+ * Decreases reconnect interval to make offline tests more stable
+ */
+public class ReconnectIntervalConfigurer implements VaadinServiceInitListener {
+    @Override
+    public void serviceInit(ServiceInitEvent event) {
+        event.getSource().addUIInitListener(uiEvent -> uiEvent.getUI()
+                .getReconnectDialogConfiguration().setReconnectInterval(1000));
+    }
+}

flow-tests/test-ccdm-flow-navigation/src/main/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener

@@ -0,0 +1,17 @@
+#
+# Copyright 2000-2022 Vaadin Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+
+com.vaadin.flow.navigate.ReconnectIntervalConfigurer

flow-tests/test-ccdm-flow-navigation/src/test/java/com/vaadin/flow/navigate/ServiceWorkerIT.java

@@ -311,8 +311,7 @@ private void openPageAndPreCacheWhenDevelopmentMode(String targetView,
         waitForDevServer();
         waitForServiceWorkerReady();
 
-        boolean isDevMode = (Boolean) getCommandExecutor()
-                .executeScript("return Vaadin.developmentMode");
+        boolean isDevMode = Boolean.getBoolean("vaadin.test.developmentMode");
         if (isDevMode) {
             // In production mode all views are supposed to be already in the
             // bundle, but in dev mode they are loaded at runtime

pom.xml

@@ -545,6 +545,7 @@
                         </execution>
                     </executions>
                     <configuration>
+                        <argLine>${failsafe.argLine}</argLine>
                         <trimStackTrace>false</trimStackTrace>
                         <enableAssertions>true</enableAssertions>
                         <parallel>all</parallel>