diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-06-03 09:14:33 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-06-03 15:14:14 +0200 |
| commit | de6aed8fb6d5d060356e19c28e79d0280773faf6 (patch) | |
| tree | 861c73080dbec2546210abfc2c2702c054ef8400 | |
| parent | 821d4e6ad110a1f16f4039b0459efe5dfb47ed08 (diff) | |
| download | mullvadvpn-de6aed8fb6d5d060356e19c28e79d0280773faf6.tar.xz mullvadvpn-de6aed8fb6d5d060356e19c28e79d0280773faf6.zip | |
Fix `test_settings_ui`
Use the correct path to find the GUI test / spec file
Update asset glob patterns
Co-authored-by: Oliver <oliver@mohlin.dev>
| -rwxr-xr-x | desktop/packages/mullvad-vpn/scripts/build-test-executable.sh | 5 | ||||
| -rw-r--r-- | test/test-manager/src/tests/ui.rs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/desktop/packages/mullvad-vpn/scripts/build-test-executable.sh b/desktop/packages/mullvad-vpn/scripts/build-test-executable.sh index 8bc64c06f1..3950f548ab 100755 --- a/desktop/packages/mullvad-vpn/scripts/build-test-executable.sh +++ b/desktop/packages/mullvad-vpn/scripts/build-test-executable.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -eu +# Enable recursive “**” globbing patterns to match files in all subdirectories +shopt -s globstar SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR/.." @@ -9,13 +11,12 @@ TARGET=${1:-$(rustc -vV | sed -n 's|host: ||p')} PRODUCT_VERSION=$(cargo run -q --bin mullvad-version) ASSETS=( - "build-standalone/src/renderer/lib/foundations/*.js" "build-standalone/src/renderer/lib/foundations/**/*.js" "build-standalone/src/shared/constants/*.js" "build-standalone/src/shared/routes.js" "build-standalone/test/e2e/utils.js" + "build-standalone/test/e2e/route-object-models/**/*.js" "build-standalone/test/e2e/shared/*.js" - "build-standalone/test/e2e/installed/*.js" "build-standalone/test/e2e/installed/**/*.js" ) diff --git a/test/test-manager/src/tests/ui.rs b/test/test-manager/src/tests/ui.rs index 8518d94a36..5228a1e802 100644 --- a/test/test-manager/src/tests/ui.rs +++ b/test/test-manager/src/tests/ui.rs @@ -315,7 +315,7 @@ pub async fn test_settings_ui( rpc: ServiceClient, _: MullvadProxyClient, ) -> Result<(), Error> { - let ui_result = run_test(&rpc, &["settings.spec"]).await?; + let ui_result = run_test(&rpc, &["vpn-settings.spec"]).await?; assert!(ui_result.success()); Ok(()) } |