Merge pull request #190 from epage/snapbox

chore: Update to snapbox 0.6
rust-cli · May 28, 2024 · f9cb13d · f9cb13d
2 parents abd2a71 + c33f6c6
commit f9cb13d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anstyle-parse/Cargo.toml b/crates/anstyle-parse/Cargo.toml
@@ -37,7 +37,7 @@ utf8 = ["dep:utf8parse"]
 codegenrs = { version = "3.0.1", default-features = false }
 divan = "0.1.14"
 proptest = "1.4.0"
-snapbox = { version = "0.5.9", features = ["path"] }
+snapbox = "0.6.5"
 vte_generate_state_changes = { version = "0.1.1" }
 
 [[bench]]

diff --git a/crates/anstyle-parse/src/state/codegen.rs b/crates/anstyle-parse/src/state/codegen.rs
@@ -10,7 +10,7 @@ fn table() {
 
     let content = String::from_utf8(content).unwrap();
     let content = codegenrs::rustfmt(&content, None).unwrap();
-    snapbox::assert_eq(file!["table.rs"], content);
+    snapbox::assert_data_eq!(content, file!["table.rs"].raw());
 }
 
 #[allow(clippy::write_literal)]

diff --git a/crates/anstyle-roff/Cargo.toml b/crates/anstyle-roff/Cargo.toml
@@ -31,7 +31,7 @@ roff = "0.2.1"
 cansi = "2.2.1"
 
 [dev-dependencies]
-snapbox = "0.5.9"
+snapbox = "0.6.5"
 
 [lints]
 workspace = true
diff --git a/crates/anstyle-roff/tests/test_roff.rs b/crates/anstyle-roff/tests/test_roff.rs
@@ -1,4 +1,5 @@
 use anstyle::Style;
+use snapbox::assert_data_eq;
 use snapbox::file;
 
 #[test]
@@ -8,7 +9,7 @@ fn test_ansi_color_output() {
     // let text = format!("{}{}", style.render(), "test");
     let text = "\u{1b}[31;44mtest".to_owned();
     let roff_doc = anstyle_roff::to_roff(&text);
-    snapbox::assert_eq(file!["roffs/ansi_color.roff"], roff_doc.to_roff());
+    assert_data_eq!(roff_doc.to_roff(), file!["roffs/ansi_color.roff"].raw());
 }
 
 #[test]
@@ -18,7 +19,7 @@ fn test_bold_output() {
     dbg!(&text);
     let roff_doc = anstyle_roff::to_roff(&text);
 
-    snapbox::assert_eq(file!["roffs/bold.roff"], roff_doc.to_roff());
+    assert_data_eq!(roff_doc.to_roff(), file!["roffs/bold.roff"].raw());
 }
 
 #[test]
@@ -28,7 +29,7 @@ fn test_italic_output() {
     dbg!(&text);
 
     let roff_doc = anstyle_roff::to_roff(&text);
-    snapbox::assert_eq(file!["roffs/italic.roff"], roff_doc.to_roff());
+    assert_data_eq!(roff_doc.to_roff(), file!["roffs/italic.roff"].raw());
 }
 
 #[test]
@@ -39,5 +40,8 @@ fn test_bright_color_output_as_bold() {
     let text = "\u{1b}[91;44mtest".to_owned();
     dbg!(&text);
     let roff_doc = anstyle_roff::to_roff(&text);
-    snapbox::assert_eq(file!["roffs/bright_ansi_colors.roff"], roff_doc.to_roff());
+    assert_data_eq!(
+        roff_doc.to_roff(),
+        file!["roffs/bright_ansi_colors.roff"].raw()
+    );
 }
diff --git a/crates/anstyle-svg/Cargo.toml b/crates/anstyle-svg/Cargo.toml
@@ -32,7 +32,7 @@ html-escape = "0.2.13"
 unicode-width = "0.1.11"
 
 [dev-dependencies]
-snapbox = "0.5.9"
+snapbox = "0.6.5"
 
 [lints]
 workspace = true
diff --git a/crates/anstyle-svg/tests/term.rs b/crates/anstyle-svg/tests/term.rs
@@ -2,12 +2,12 @@
 fn rainbow() {
     let input = std::fs::read_to_string("tests/rainbow.vte").unwrap();
     let actual = anstyle_svg::Term::new().render_svg(&input);
-    snapbox::assert_eq(snapbox::file!["rainbow.svg": Text], actual);
+    snapbox::assert_data_eq!(actual, snapbox::file!["rainbow.svg": Text].raw());
 }
 
 #[test]
 fn rg_linus() {
     let input = std::fs::read_to_string("tests/rg_linus.vte").unwrap();
     let actual = anstyle_svg::Term::new().render_svg(&input);
-    snapbox::assert_eq(snapbox::file!["rg_linus.svg": Text], actual);
+    snapbox::assert_data_eq!(actual, snapbox::file!["rg_linus.svg": Text].raw());
 }