fix env_not tests

This commit is contained in:
sagie gur ari
2025-01-18 14:29:31 +00:00
parent c32be139c7
commit cb0d693f0e
4 changed files with 8 additions and 7 deletions
-1
View File
@@ -1,4 +1,3 @@
use super::*;
use crate::completion::generate_completion_zsh;
use std::fs;
use std::io::Cursor;
+7 -4
View File
@@ -30,7 +30,7 @@ enum EnvMapType {
/// Validate map for `env_contains` in `TaskCondition`.
EnvContains,
/// Validate map for `env_not` in `TaskCondition`.
EnvNot
EnvNot,
}
fn validate_env_map(
@@ -75,10 +75,13 @@ fn validate_env_not(condition: &TaskCondition, validate_any: bool) -> bool {
}
fn validate_env_contains(condition: &TaskCondition, validate_any: bool) -> bool {
validate_env_map(condition.env_contains.clone(), EnvMapType::EnvContains, validate_any)
validate_env_map(
condition.env_contains.clone(),
EnvMapType::EnvContains,
validate_any,
)
}
fn validate_env_set(condition: &TaskCondition, validate_any: bool) -> bool {
let env = condition.env_set.clone();
match env {
@@ -520,7 +523,7 @@ fn validate_criteria(flow_info: Option<&FlowInfo>, condition: &Option<TaskCondit
} else if group_or_condition && !valid {
not_valid_found = true;
}
valid = validate_env_not(&condition_struct, validate_any);
if group_or_condition && valid && condition_struct.env_not.is_some() {
return true;
+1 -1
View File
@@ -1557,7 +1557,7 @@ fn validate_env_not_valid_with_any() {
env_true: None,
env_false: None,
env: None,
env_not: Some(env_values),
env_not: Some(env_values),
env_contains: None,
rust_version: None,
files_exist: None,
-1
View File
@@ -3634,7 +3634,6 @@ fn task_get_normalized_task_with_override_clear_true() {
condition: None,
condition_script: None,
condition_script_runner_args: None,
env_not: None,
ignore_errors: None,
force: None,
env_files: None,