diff --git a/crates/tauri-utils/src/acl/identifier.rs b/crates/tauri-utils/src/acl/identifier.rs index a95c6d534..bb571c9fd 100644 --- a/crates/tauri-utils/src/acl/identifier.rs +++ b/crates/tauri-utils/src/acl/identifier.rs @@ -254,9 +254,9 @@ mod tests { assert!(ident("prefix:-base").is_err()); assert!(ident("prefix:base-").is_err()); - assert!(ident("pre--fix:base--sep").is_err()); - assert!(ident("prefix:base--sep").is_err()); - assert!(ident("pre--fix:base").is_err()); + assert!(ident("pre--fix:base--sep").is_ok()); + assert!(ident("prefix:base--sep").is_ok()); + assert!(ident("pre--fix:base").is_ok()); assert!(ident("prefix::base").is_err()); assert!(ident(":base").is_err()); diff --git a/crates/tauri-utils/src/config_v1/mod.rs b/crates/tauri-utils/src/config_v1/mod.rs index a5ca81a87..5fc9450d9 100644 --- a/crates/tauri-utils/src/config_v1/mod.rs +++ b/crates/tauri-utils/src/config_v1/mod.rs @@ -2945,6 +2945,7 @@ where /// } /// } /// ``` +#[allow(rustdoc::invalid_codeblock_attributes)] #[skip_serializing_none] #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)] #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] diff --git a/crates/tauri-utils/src/platform.rs b/crates/tauri-utils/src/platform.rs index d6e659147..1142af5e3 100644 --- a/crates/tauri-utils/src/platform.rs +++ b/crates/tauri-utils/src/platform.rs @@ -433,7 +433,7 @@ mod tests { #[cfg(target_os = "macos")] assert!(resource_dir.is_err()); #[cfg(target_os = "linux")] - assert_eq!(resource_dir.unwrap(), PathBuf::from("/usr/lib/my-app")); + assert_eq!(resource_dir.unwrap(), PathBuf::from("/usr/lib/MyApp")); #[cfg(windows)] assert_eq!(resource_dir.unwrap(), path.parent().unwrap()); } diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__basic-ping.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__basic-ping.snap index dae9eff35..9d385d122 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__basic-ping.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__basic-ping.snap @@ -3,6 +3,7 @@ source: crates/tests/acl/src/lib.rs expression: resolved --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:ping|ping": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer-remote.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer-remote.snap index f0bc309e7..dd9b05093 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer-remote.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer-remote.snap @@ -3,6 +3,7 @@ source: crates/tests/acl/src/lib.rs expression: resolved --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:fs|read_dir": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer.snap index b2ff838da..a3e4cd8b3 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__file-explorer.snap @@ -3,6 +3,7 @@ source: crates/tests/acl/src/lib.rs expression: resolved --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:fs|read_dir": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwebview.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwebview.snap index 1b58f4373..772b8f7d6 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwebview.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwebview.snap @@ -3,6 +3,7 @@ source: crates/tests/acl/src/lib.rs expression: resolved --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:ping|ping": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwindow.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwindow.snap index 08392baea..f80ef7566 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwindow.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__multiwindow.snap @@ -1,9 +1,9 @@ --- source: crates/tests/acl/src/lib.rs expression: resolved -snapshot_kind: text --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:fs|move": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope-extended.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope-extended.snap index e633c46fd..41d2d99d7 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope-extended.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope-extended.snap @@ -1,9 +1,9 @@ --- source: crates/tests/acl/src/lib.rs expression: resolved -snapshot_kind: text --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:fs|move": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope.snap b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope.snap index d049085d8..e98810961 100644 --- a/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope.snap +++ b/crates/tests/acl/fixtures/snapshots/acl_tests__tests__scope.snap @@ -1,9 +1,9 @@ --- source: crates/tests/acl/src/lib.rs expression: resolved -snapshot_kind: text --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:fs|move": [ ResolvedCommand { diff --git a/crates/tests/acl/fixtures/snapshots/linux/acl_tests__tests__platform-specific-permissions.snap b/crates/tests/acl/fixtures/snapshots/linux/acl_tests__tests__platform-specific-permissions.snap index 62cdda315..7fff64b5a 100644 --- a/crates/tests/acl/fixtures/snapshots/linux/acl_tests__tests__platform-specific-permissions.snap +++ b/crates/tests/acl/fixtures/snapshots/linux/acl_tests__tests__platform-specific-permissions.snap @@ -3,6 +3,7 @@ source: crates/tests/acl/src/lib.rs expression: resolved --- Resolved { + has_app_acl: false, allowed_commands: { "plugin:os|spawn": [ ResolvedCommand { @@ -88,10 +89,5 @@ Resolved { deny: [], }, }, - global_scope: { - "os": ResolvedScope { - allow: [], - deny: [], - }, - }, + global_scope: {}, }