Fix CI: formatting, git config in tests, case-sensitive policy test

ericbeland · ericbeland · commit 2efc501aa817 · 2026-02-08T19:54:46.000-05:00
diff --git a/README.md b/README.md
@@ -1,8 +1,11 @@
 # Sorcery
 
-Hyperlinks for your editor (or IDE) that open on the right line. That's *Sorcery!*
+Editor/IDE hyperlinks that open to the line. That's *Sorcery!*
 
-# Sorcery enables:
+# Overview
+
+Sorcery Desktop is a system tray app that enables srcuri (Sorcery) protocol links. The srcuri 
+protocol makes links to files/lines work.
 
 * Share editor links with other developers that open in their editor, on the correct line
 * Command-Click a file-path in your terminal--it opens in your editor/IDE
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
@@ -1275,12 +1275,7 @@ pub async fn rename_workspace(
     new_name: String,
     settings_manager: State<'_, Arc<SettingsManager>>,
 ) -> Result<(), String> {
-    rename_workspace_impl(
-        settings_manager.inner().as_ref(),
-        &name,
-        &new_name,
-    )
-    .await
+    rename_workspace_impl(settings_manager.inner().as_ref(), &name, &new_name).await
 }
 
 async fn rename_workspace_impl(
@@ -1649,8 +1644,7 @@ fn workspace_matches_lookup_name(
     workspace: &crate::settings::WorkspaceConfig,
     lookup_key: &str,
 ) -> bool {
-    identity::canonical_name_for_lookup(&identity::derive_workspace_name(workspace))
-        == lookup_key
+    identity::canonical_name_for_lookup(&identity::derive_workspace_name(workspace)) == lookup_key
 }
 
 async fn enrich_clone_dialog_data(
@@ -1667,9 +1661,7 @@ async fn enrich_clone_dialog_data(
     let name_matches: Vec<_> = settings
         .workspaces
         .iter()
-        .filter(|workspace| {
-            identity::canonical_name_for_lookup(&workspace.name) == desired_lookup
-        })
+        .filter(|workspace| identity::canonical_name_for_lookup(&workspace.name) == desired_lookup)
         .collect();
 
     let same_remote_name_exists = normalized_remote.as_ref().is_some_and(|remote| {
@@ -1706,12 +1698,11 @@ async fn enrich_clone_dialog_data(
 
     if different_remote_name_exists {
         let suggested = derive_workspace_name_from_path(&target_path, &data.workspace_name);
-        let suggested =
-            if identity::canonical_name_for_lookup(&suggested) == desired_lookup {
-                format!("{suggested}-clone")
-            } else {
-                suggested
-            };
+        let suggested = if identity::canonical_name_for_lookup(&suggested) == desired_lookup {
+            format!("{suggested}-clone")
+        } else {
+            suggested
+        };
 
         data.suggested_name = Some(suggested.clone());
         data.clone_validation_message = Some(format!(
@@ -2054,9 +2045,8 @@ pub fn detect_browsers() -> Vec<crate::browser_detection::BrowserInfo> {
 #[cfg(test)]
 mod tests {
     use super::{
-        change_workspace_folder_impl, ensure_workspace_policy_allows_path,
-        promote_workspace_impl, remove_workspace_impl, rename_workspace_impl,
-        resolve_conflict_open_target_path,
+        change_workspace_folder_impl, ensure_workspace_policy_allows_path, promote_workspace_impl,
+        remove_workspace_impl, rename_workspace_impl, resolve_conflict_open_target_path,
     };
     use crate::settings::{
         Settings, SettingsManager, WorkspaceConfig, WorkspaceKind, WorkspaceState,
diff --git a/src-tauri/src/config_paths.rs b/src-tauri/src/config_paths.rs
@@ -6,6 +6,7 @@ const APP_CONFIG_DIR: &str = "sorcery-desktop";
 pub fn canonical_config_dir() -> Result<PathBuf> {
     let config_dir = dirs::config_dir().context("Could not find config directory")?;
     let sorcery_dir = config_dir.join(APP_CONFIG_DIR);
-    std::fs::create_dir_all(&sorcery_dir).context("Failed to create sorcery-desktop config directory")?;
+    std::fs::create_dir_all(&sorcery_dir)
+        .context("Failed to create sorcery-desktop config directory")?;
     Ok(sorcery_dir)
 }
diff --git a/src-tauri/src/protocol_handler/git.rs b/src-tauri/src/protocol_handler/git.rs
@@ -687,6 +687,14 @@ mod tests {
         let work = temp.path().join("work");
         std::fs::create_dir(&work).expect("create work dir");
         run(Command::new("git").arg("init"), &work);
+        run(
+            Command::new("git").args(["config", "user.email", "test@test.com"]),
+            &work,
+        );
+        run(
+            Command::new("git").args(["config", "user.name", "Test"]),
+            &work,
+        );
         std::fs::write(work.join("README.md"), "hello").expect("write README");
         run(Command::new("git").args(["add", "README.md"]), &work);
         run(Command::new("git").args(["commit", "-m", "init"]), &work);
diff --git a/src-tauri/src/protocol_handler/mod.rs b/src-tauri/src/protocol_handler/mod.rs
@@ -236,11 +236,7 @@ impl ProtocolHandler {
             .and_then(|workspace| workspace.normalized_path)
     }
 
-    async fn resolve_workspace(
-        &self,
-        name: &str,
-        remote: Option<&str>,
-    ) -> WorkspaceResolution {
+    async fn resolve_workspace(&self, name: &str, remote: Option<&str>) -> WorkspaceResolution {
         let (remote_matches, key_matches) = self
             .settings_manager
             .resolve_workspace_by_name(name, remote)
diff --git a/src-tauri/src/settings/manager.rs b/src-tauri/src/settings/manager.rs
@@ -409,10 +409,7 @@ impl SettingsManager {
                 PolicyDecision::Allowed => {}
                 PolicyDecision::AdvisoryViolation(violation) => {
                     let name = identity::derive_workspace_name(workspace);
-                    warn!(
-                        "Policy advisory for workspace '{}': {}",
-                        name, violation
-                    );
+                    warn!("Policy advisory for workspace '{}': {}", name, violation);
                 }
                 PolicyDecision::EnforcedViolation(violation) => {
                     let name = identity::derive_workspace_name(workspace);
@@ -535,9 +532,8 @@ impl SettingsManager {
 
         let mut key_to_indices: HashMap<String, Vec<usize>> = HashMap::new();
         for (index, workspace) in settings.workspaces.iter().enumerate() {
-            let key = identity::canonical_name_for_lookup(
-                &identity::derive_workspace_name(workspace),
-            );
+            let key =
+                identity::canonical_name_for_lookup(&identity::derive_workspace_name(workspace));
             key_to_indices.entry(key).or_default().push(index);
         }
 
@@ -637,8 +633,7 @@ impl SettingsManager {
             let canonical = identity::canonical_name_for_lookup(&name);
             let path = workspace.path.clone();
 
-            if let Some(existing_path) = seen_names.insert(canonical.clone(), path.clone())
-            {
+            if let Some(existing_path) = seen_names.insert(canonical.clone(), path.clone()) {
                 return Err(SettingsValidationError::DuplicateWorkspaceName {
                     workspace_name: canonical,
                     first_path: existing_path,
@@ -658,9 +653,7 @@ impl SettingsManager {
             }
 
             let name = identity::derive_workspace_name(workspace);
-            if let Some(existing_name) =
-                normalized_paths.insert(path.clone(), name.clone())
-            {
+            if let Some(existing_name) = normalized_paths.insert(path.clone(), name.clone()) {
                 return Err(SettingsValidationError::DuplicateWorkspacePath {
                     workspace_path: path.to_string_lossy().to_string(),
                     first_workspace_name: existing_name,
diff --git a/src-tauri/src/settings/policy.rs b/src-tauri/src/settings/policy.rs
@@ -116,7 +116,9 @@ impl WorkspacePolicy {
                 .insert(key.clone(), PolicyMappingRule { expected_remote })
                 .is_some()
             {
-                return Err(PolicyBuildError::DuplicateWorkspaceName { workspace_name: key });
+                return Err(PolicyBuildError::DuplicateWorkspaceName {
+                    workspace_name: key,
+                });
             }
         }
 
@@ -191,13 +193,13 @@ impl WorkspacePolicy {
     }
 
     fn workspace_violation(&self, workspace: &WorkspaceConfig) -> Option<PolicyViolation> {
-        let name = identity::canonical_name_for_lookup(
-            &identity::derive_workspace_name(workspace),
-        );
+        let name = identity::canonical_name_for_lookup(&identity::derive_workspace_name(workspace));
 
         if !self.mappings.is_empty() {
             let Some(rule) = self.mappings.get(&name) else {
-                return Some(PolicyViolation::WorkspaceNameNotAllowed { workspace_name: name });
+                return Some(PolicyViolation::WorkspaceNameNotAllowed {
+                    workspace_name: name,
+                });
             };
 
             if let Some(expected_remote) = rule.expected_remote.as_deref() {
@@ -230,7 +232,9 @@ impl WorkspacePolicy {
 
         let Some(repo_identity) = workspace.repo_identity.as_ref() else {
             if workspace.workspace_kind == WorkspaceKind::Git {
-                return Some(PolicyViolation::RemoteRequiredForWorkspace { workspace_name: name });
+                return Some(PolicyViolation::RemoteRequiredForWorkspace {
+                    workspace_name: name,
+                });
             }
             return None;
         };
@@ -461,7 +465,7 @@ mod tests {
                     remote: Some("github.com/rails/rails".to_string()),
                 },
                 super::super::models::WorkspacePolicyMapping {
-                    name: "Rails".to_string(),
+                    name: "rails".to_string(),
                     remote: Some("github.com/company/rails".to_string()),
                 },
             ],
diff --git a/src-tauri/tests/frontend_security_regression_tests.rs b/src-tauri/tests/frontend_security_regression_tests.rs
@@ -5,9 +5,7 @@ use std::path::PathBuf;
 
 fn read_workspace_file(relative: &str) -> String {
     let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    let base = manifest_dir
-        .parent()
-        .expect("workspace root");
+    let base = manifest_dir.parent().expect("workspace root");
     fs::read_to_string(base.join(relative)).expect("read file")
 }
 
@@ -30,7 +28,9 @@ fn workspace_conflict_escapes_untrusted_fields_and_uses_bound_handlers() {
     assert!(html.contains("function escapeHtml(value)"));
     assert!(html.contains("const name = escapeHtml(candidate.name);"));
     assert!(html.contains("const workspacePath = escapeHtml(candidate.workspace_path);"));
-    assert!(html.contains("const primaryRemote = escapeHtml(candidate.primary_remote || 'remote: not available');"));
+    assert!(html.contains(
+        "const primaryRemote = escapeHtml(candidate.primary_remote || 'remote: not available');"
+    ));
     assert!(html.contains("bindEvents();"));
     assert!(!html.contains("onclick=\""));
     assert!(!html.contains("onchange=\""));

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ const APP_CONFIG_DIR: &str = "sorcery-desktop";`
`6`	`6`	`pub fn canonical_config_dir() -> Result<PathBuf> {`
`7`	`7`	`let config_dir = dirs::config_dir().context("Could not find config directory")?;`
`8`	`8`	`let sorcery_dir = config_dir.join(APP_CONFIG_DIR);`
`9`		`- std::fs::create_dir_all(&sorcery_dir).context("Failed to create sorcery-desktop config directory")?;`
	`9`	`+ std::fs::create_dir_all(&sorcery_dir)`
	`10`	`+ .context("Failed to create sorcery-desktop config directory")?;`
`10`	`11`	`Ok(sorcery_dir)`
`11`	`12`	`}`