Merge branch 'master' into integration_tests

ruuvi · May 9, 2024 · 1318aa4 · 1318aa4
2 parents 366243a + 4b8c386
commit 1318aa4
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 4 deletions.
diff --git a/src/page_scanning.mjs b/src/page_scanning.mjs
@@ -185,10 +185,6 @@ class PageScanning {
         } else {
             this.#sect_advanced.show()
         }
-
-        if (this.#checkbox_scan_filtering.isChecked()) {
-            await this.#refreshListOfMac()
-        }
     }
 
     #extractMacAddrFromRowId(prefixedMacAddr) {

diff --git a/tests/test_http.yaml b/tests/test_http.yaml
@@ -88,6 +88,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_http_with_auth.yaml b/tests/test_http_with_auth.yaml
@@ -107,6 +107,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_https_with_server_and_client_cert_checking.yaml b/tests/test_https_with_server_and_client_cert_checking.yaml
@@ -110,6 +110,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_https_with_server_cert_checking.yaml b/tests/test_https_with_server_cert_checking.yaml
@@ -95,6 +95,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_mqtt_aws.yaml b/tests/test_mqtt_aws.yaml
@@ -104,6 +104,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_mqtt_ssl.yaml b/tests/test_mqtt_ssl.yaml
@@ -92,6 +92,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_mqtt_tcp.yaml b/tests/test_mqtt_tcp.yaml
@@ -91,6 +91,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_mqtt_ws.yaml b/tests/test_mqtt_ws.yaml
@@ -92,6 +92,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"

diff --git a/tests/test_mqtt_wss.yaml b/tests/test_mqtt_wss.yaml
@@ -92,6 +92,7 @@ pages:
 
   - page: "#page-scanning"
     steps:
+      - do: waitUntilLoaded 15000  # Wait until loaded
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"