diff --git a/Cargo.lock b/Cargo.lock index 8b89e50..138dcff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,13 +40,13 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.8" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" +checksum = "b800c4403e8105d959595e1f88119e78bc12bc874c4336973658b648a746ba93" dependencies = [ "bstr", "doc-comment", - "predicates 2.0.2", + "predicates", "predicates-core", "predicates-tree", "wait-timeout", @@ -203,12 +203,6 @@ dependencies = [ "syn", ] -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" @@ -320,9 +314,9 @@ dependencies = [ [[package]] name = "float-cmp" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ "num-traits", ] @@ -833,19 +827,6 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -[[package]] -name = "predicates" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - [[package]] name = "predicates" version = "2.0.2" @@ -853,8 +834,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c143348f141cc87aab5b950021bac6145d0e5ae754b0591de23244cee42c9308" dependencies = [ "difflib", + "float-cmp", "itertools", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -1251,7 +1235,7 @@ dependencies = [ "flate2", "log", "pager", - "predicates 1.0.8", + "predicates", "reqwest", "serde", "serde_derive", diff --git a/Cargo.toml b/Cargo.toml index fc5e2bb..0a603a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,9 +34,9 @@ walkdir = "2.0.1" pager = "0.16" [dev-dependencies] -assert_cmd = "1.0.1" +assert_cmd = "2.0.1" escargot = "0.5" -predicates = "1.0" +predicates = "2.0.2" tempfile = "3.1.0" filetime = "0.2.10" diff --git a/tests/lib.rs b/tests/lib.rs index c0db85e..a6414e6 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -7,7 +7,7 @@ use std::time::{Duration, SystemTime}; use assert_cmd::prelude::*; use predicates::boolean::PredicateBooleanExt; -use predicates::prelude::predicate::str::{contains, is_empty, similar}; +use predicates::prelude::predicate::str::{contains, diff, is_empty}; use tempfile::{Builder, TempDir}; // TODO: Should be 'cache::CACHE_DIR_ENV_VAR'. This requires to have a library crate for the logic. @@ -336,7 +336,7 @@ fn test_markdown_rendering() { .args(["-m", "which"]) .assert() .success() - .stdout(similar(expected)); + .stdout(diff(expected)); } fn _test_correct_rendering( @@ -358,7 +358,7 @@ fn _test_correct_rendering( .args(["--color", color_option, "-f", file_path.to_str().unwrap()]) .assert() .success() - .stdout(similar(expected)); + .stdout(diff(expected)); } /// An end-to-end integration test for direct file rendering (v1 syntax). @@ -446,7 +446,7 @@ fn test_correct_rendering_with_config() { .args(["--color", "always", "-f", file_path.to_str().unwrap()]) .assert() .success() - .stdout(similar(expected)); + .stdout(diff(expected)); } #[test] @@ -597,7 +597,7 @@ fn test_custom_page_overwrites() { .args(["inkscape-v2", "--color", "never"]) .assert() .success() - .stdout(similar(expected)); + .stdout(diff(expected)); } /// End-End test to ensure that .patch files are appened to pages in the cache_dir @@ -624,7 +624,7 @@ fn test_custom_patch_appends_to_common() { .args(["inkscape-v2", "--color", "never"]) .assert() .success() - .stdout(similar(expected)); + .stdout(diff(expected)); } /// End-End test to ensure that .patch files are not appended to .page files in the custom_pages_dir @@ -654,7 +654,7 @@ fn test_custom_patch_does_not_append_to_custom() { .args(["inkscape-v2", "--color", "never"]) .assert() .success() - .stdout(similar(expected)); + .stdout(diff(expected)); } #[test]