From 4b8c3863b2a4f19ee94deb22477e5389ca66cf26 Mon Sep 17 00:00:00 2001 From: TheSomeMan Date: Thu, 9 May 2024 17:11:55 +0700 Subject: [PATCH] Fix #383: Page Scanning: GUI loading icon disappears without waiting for sensor list update to finish (#384) * Fix #383: Page Scanning: GUI loading icon disappears without waiting for sensor list update to finish * [#383] Integration tests: add waiting until the Page Scanning is loaded * [#383] Integration tests: add waiting until the Page Scanning is loaded --- src/page_scanning.mjs | 4 ---- tests/test_http.yaml | 1 + tests/test_http_with_auth.yaml | 1 + tests/test_https_with_server_and_client_cert_checking.yaml | 1 + tests/test_https_with_server_cert_checking.yaml | 1 + tests/test_mqtt_aws.yaml | 1 + tests/test_mqtt_ssl.yaml | 1 + tests/test_mqtt_tcp.yaml | 1 + tests/test_mqtt_ws.yaml | 1 + tests/test_mqtt_wss.yaml | 1 + 10 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/page_scanning.mjs b/src/page_scanning.mjs index 4a26f27..483badd 100644 --- 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 index ff1239f..03747af 100644 --- a/tests/test_http.yaml +++ b/tests/test_http.yaml @@ -86,6 +86,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 index 7f82fb3..ce9b163 100644 --- a/tests/test_http_with_auth.yaml +++ b/tests/test_http_with_auth.yaml @@ -105,6 +105,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 index d6879e2..0a0a46d 100644 --- a/tests/test_https_with_server_and_client_cert_checking.yaml +++ b/tests/test_https_with_server_and_client_cert_checking.yaml @@ -108,6 +108,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 index ef5b53f..872bf3b 100644 --- a/tests/test_https_with_server_cert_checking.yaml +++ b/tests/test_https_with_server_cert_checking.yaml @@ -93,6 +93,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 index ec496d3..4476c72 100644 --- 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 index c0b43a3..ddf181a 100644 --- 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 index 59c4fdb..f9bd5de 100644 --- 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 index 222748f..618622e 100644 --- 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 index 55806b0..b107548 100644 --- 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"