fixup tests

Author: untitaker

tests/cli.rs

@@ -15,8 +15,8 @@ fn test_dead_link() {
         predicate::str::is_match(
             r#"^Reading files
 Checking 1 links from 1 files \(1 documents\)
-\...index\.html
-  error: bad link .bar.html
+\..index\.html
+  error: bad link /bar.html
 
 Found 1 bad links
 "#,
@@ -40,8 +40,8 @@ fn test_dead_anchor() {
         predicate::str::is_match(
             r#"^Reading files
 Checking 1 links from 2 files \(2 documents\)
-\...index\.html
-  error: bad link .bar.html#goo
+\..index\.html
+  error: bad link /bar.html#goo
 
 Found 0 bad links
 Found 1 bad anchors
@@ -65,81 +65,3 @@ fn test_bad_dir() {
             "Error: IO error for operation on non_existing_dir:",
         ));
 }
-
-#[test]
-fn test_redirects() {
-    let site = assert_fs::TempDir::new().unwrap();
-
-    site.child("_redirects")
-        .write_str(
-            "# This is a comment\n\
-             \n\
-             /old-page /new-page.html 301\n\
-             /external https://example.com/page\n\
-             /broken /missing-page.html\n\
-             /another /target.html",
-        )
-        .unwrap();
-
-    site.child("new-page.html").touch().unwrap();
-    site.child("target.html").touch().unwrap();
-
-    site.child("index.html")
-        .write_str("<a href='/old-page'>link</a>")
-        .unwrap();
-
-    let mut cmd = Command::cargo_bin("hyperlink").unwrap();
-    cmd.current_dir(site.path()).arg(".");
-
-    cmd.assert().failure().code(1).stdout(
-        predicate::str::is_match(
-            r#"^Reading files
-Checking 4 links from 4 files \(4 documents\)
-\....._redirects
-  error: bad link .missing-page\.html
-
-Found 1 bad links
-"#,
-        )
-        .unwrap(),
-    );
-
-    site.close().unwrap();
-}
-
-#[test]
-fn test_redirects_only_at_root() {
-    let site = assert_fs::TempDir::new().unwrap();
-
-    site.child("_redirects")
-        .write_str("/old-page /new-page.html")
-        .unwrap();
-
-    site.child("subdir/_redirects")
-        .write_str("/sub-old /sub-new.html")
-        .unwrap();
-
-    site.child("new-page.html").touch().unwrap();
-
-    site.child("index.html")
-        .write_str("<a href='/old-page'>link to old</a><a href='/sub-old'>link to sub</a>")
-        .unwrap();
-
-    let mut cmd = Command::cargo_bin("hyperlink").unwrap();
-    cmd.current_dir(site.path()).arg(".");
-
-    cmd.assert().failure().code(1).stdout(
-        predicate::str::is_match(
-            r#"^Reading files
-Checking 3 links from 4 files \(3 documents\)
-\./index\.html
-  error: bad link /sub-old
-
-Found 1 bad links
-"#,
-        )
-        .unwrap(),
-    );
-
-    site.close().unwrap();
-}

tests/cli_snapshots.rs

@@ -1,3 +1,4 @@
+use assert_fs::prelude::*;
 use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
 use std::process::Command;
 
@@ -98,3 +99,85 @@ fn test_version() {
     ----- stderr -----
     "###);
 }
+
+#[test]
+fn test_redirects() {
+    let site = assert_fs::TempDir::new().unwrap();
+
+    site.child("_redirects")
+        .write_str(
+            "# This is a comment\n\
+             \n\
+             /old-page /new-page.html 301\n\
+             /external https://example.com/page\n\
+             /broken /missing-page.html\n\
+             /another /target.html",
+        )
+        .unwrap();
+
+    site.child("new-page.html").touch().unwrap();
+    site.child("target.html").touch().unwrap();
+
+    site.child("index.html")
+        .write_str("<a href='/old-page'>link</a>")
+        .unwrap();
+
+    let mut settings = insta::Settings::clone_current();
+    settings.add_filter(r"[/\\]", "/");
+    let _guard = settings.bind_to_scope();
+
+    assert_cmd_snapshot!(cli().arg(".").current_dir(site.path()), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    Reading files
+    Checking 4 links from 4 files (4 documents)
+    ./_redirects
+      error: bad link /missing-page.html
+
+    Found 1 bad links
+
+    ----- stderr -----
+    "###);
+
+    site.close().unwrap();
+}
+
+#[test]
+fn test_redirects_only_at_root() {
+    let site = assert_fs::TempDir::new().unwrap();
+
+    site.child("_redirects")
+        .write_str("/old-page /new-page.html")
+        .unwrap();
+
+    site.child("subdir/_redirects")
+        .write_str("/sub-old /sub-new.html")
+        .unwrap();
+
+    site.child("new-page.html").touch().unwrap();
+
+    site.child("index.html")
+        .write_str("<a href='/old-page'>link to old</a><a href='/sub-old'>link to sub</a>")
+        .unwrap();
+
+    let mut settings = insta::Settings::clone_current();
+    settings.add_filter(r"[/\\]", "/");
+    let _guard = settings.bind_to_scope();
+
+    assert_cmd_snapshot!(cli().arg(".").current_dir(site.path()), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    Reading files
+    Checking 3 links from 4 files (3 documents)
+    ./index.html
+      error: bad link /sub-old
+
+    Found 1 bad links
+
+    ----- stderr -----
+    "###);
+
+    site.close().unwrap();
+}