Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions src/scanner/modes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,7 @@ fn load_explicit_scan_rules(cli: &Cli, language: &str) -> Result<Rules> {
}
}

if all_rules.len() == 1 {
Ok(all_rules.into_iter().next().unwrap())
} else {
Rules::merge_rules(all_rules)
}
Rules::merge_rules(all_rules)
}

/// Print the banner shown at the start of an explicit scan.
Expand Down Expand Up @@ -316,11 +312,7 @@ fn load_rules_for_detected_language(cli: &Cli, language: &str) -> Result<Option<
return Ok(None); // Skip if no rules found
}

let rules = if all_rules.len() == 1 {
all_rules.into_iter().next().unwrap()
} else {
Rules::merge_rules(all_rules)?
};
let rules = Rules::merge_rules(all_rules)?;
Ok(Some(rules))
}

Expand Down Expand Up @@ -731,4 +723,33 @@ mod tests {

assert!(load_rules(&cli, &context).is_err());
}

#[test]
fn load_explicit_scan_rules_loads_and_merges_rules() {
let cli = base_cli();
let rules = load_explicit_scan_rules(&cli, "python").expect("explicit rules should load");
assert!(!rules.rules.is_empty());
}

#[test]
fn load_explicit_scan_rules_handles_nonexistent_rules_gracefully() {
let mut cli = base_cli();
cli.use_file_rules = true;
cli.language = Some("python".to_string());
cli.rules_path = Some("non_existent_rules_path.ron".to_string());

let res = load_explicit_scan_rules(&cli, "python");
assert!(res.is_err());
}
Comment thread
juangaitanv marked this conversation as resolved.

#[test]
fn load_rules_for_detected_language_returns_none_when_no_rules_found() {
let temp_dir = tempfile::tempdir().expect("failed to create temp dir");
let mut cli = base_cli();
cli.use_file_rules = true;
cli.rules_dir = Some(temp_dir.path().to_str().unwrap().to_string());

let res = load_rules_for_detected_language(&cli, "python").expect("should return Ok");
assert!(res.is_none());
}
}
Loading