fix(filters)!: Dont normalize all redactions

assert-rs · Apr 22, 2024 · 34272b3 · 34272b3
1 parent 0841264
commit 34272b3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/crates/snapbox/src/filters/redactions.rs b/crates/snapbox/src/filters/redactions.rs
@@ -178,9 +178,7 @@ impl From<&'static str> for RedactedValue {
             Self { inner: None }
         } else {
             Self {
-                inner: Some(RedactedValueInner::String(crate::filters::normalize_text(
-                    inner,
-                ))),
+                inner: Some(RedactedValueInner::Str(inner)),
             }
         }
     }
@@ -192,9 +190,7 @@ impl From<String> for RedactedValue {
             Self { inner: None }
         } else {
             Self {
-                inner: Some(RedactedValueInner::String(crate::filters::normalize_text(
-                    &inner,
-                ))),
+                inner: Some(RedactedValueInner::String(inner)),
             }
         }
     }

diff --git a/src/cases.rs b/src/cases.rs
@@ -137,7 +137,9 @@ impl TestCases {
         var: &'static str,
         value: impl Into<Cow<'static, str>>,
     ) -> Result<&Self, crate::Error> {
-        self.substitutions.borrow_mut().insert(var, value.into())?;
+        let value = value.into();
+        let value = snapbox::filters::normalize_text(&value);
+        self.substitutions.borrow_mut().insert(var, value)?;
         Ok(self)
     }
 
@@ -150,7 +152,11 @@ impl TestCases {
     ) -> Result<&Self, crate::Error> {
         self.substitutions
             .borrow_mut()
-            .extend(vars.into_iter().map(|(v, r)| (v, r.into())))?;
+            .extend(vars.into_iter().map(|(var, value)| {
+                let value = value.into();
+                let value = snapbox::filters::normalize_text(&value);
+                (var, value)
+            }))?;
         Ok(self)
     }
 

diff --git a/src/runner.rs b/src/runner.rs
@@ -199,14 +199,10 @@ impl Case {
         };
         let mut substitutions = substitutions.clone();
         if let Some(root) = fs_context.path() {
-            substitutions
-                .insert("[ROOT]", root.display().to_string())
-                .unwrap();
+            substitutions.insert("[ROOT]", root.to_owned()).unwrap();
         }
         if let Some(cwd) = cwd.clone().or_else(|| std::env::current_dir().ok()) {
-            substitutions
-                .insert("[CWD]", cwd.display().to_string())
-                .unwrap();
+            substitutions.insert("[CWD]", cwd).unwrap();
         }
         substitutions
             .insert("[EXE]", std::env::consts::EXE_SUFFIX)