Merge pull request #1167 from epage/snap

chore: Update snapbox
cobalt-org · Feb 15, 2024 · bd21d39 · bd21d39
2 parents 8eed235 + ed93667
commit bd21d39
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -113,8 +113,8 @@ anstream = "0.6.11"
 chrono = "0.4.33"
 
 [dev-dependencies]
-trycmd = "0.14"
-snapbox = { version = "0.4.16", features = ["diff"] }
+trycmd = "0.15"
+snapbox = { version = "0.5.0", features = ["diff"] }
 
 [features]
 default = ["syntax-highlight", "sass", "serve", "html-minifier"]

diff --git a/src/syntax_highlight.rs b/src/syntax_highlight.rs
@@ -226,21 +226,6 @@ mod test_syntsx {
     }
     ";
 
-    const CODEBLOCK_RENDERED: &str =
-        "<pre style=\"background-color:#2b303b;\">\n\
-         <code><span style=\"color:#b48ead;\">mod </span>\
-         <span style=\"color:#c0c5ce;\">test {\n\
-         </span><span style=\"color:#c0c5ce;\">        </span>\
-         <span style=\"color:#b48ead;\">fn \
-         </span><span style=\"color:#8fa1b3;\">hello</span><span style=\"color:#c0c5ce;\">(\
-         </span><span style=\"color:#bf616a;\">arg</span><span style=\"color:#c0c5ce;\">: int) -&gt; \
-         </span><span style=\"color:#b48ead;\">bool </span><span style=\"color:#c0c5ce;\">{\n\
-         </span><span style=\"color:#c0c5ce;\">            \
-         </span><span style=\"color:#d08770;\">true\n\
-         </span><span style=\"color:#c0c5ce;\">        }\n\
-         </span><span style=\"color:#c0c5ce;\">    }\n\
-         </span><span style=\"color:#c0c5ce;\">    </span></code></pre>\n";
-
     #[test]
     fn highlight_block_renders_rust() {
         let syntax = std::sync::Arc::new(SyntaxHighlight::new());
@@ -257,11 +242,8 @@ mod test_syntsx {
             ))
             .unwrap();
         let output = template.render(&liquid::Object::new());
-        snapbox::assert_eq(CODEBLOCK_RENDERED, output.unwrap());
-    }
-
-    const MARKDOWN_RENDERED: &str =
-        "<pre style=\"background-color:#2b303b;\">\n\
+        let expected =
+        snapbox::str!["<pre style=\"background-color:#2b303b;\">\n\
          <code><span style=\"color:#b48ead;\">mod </span>\
          <span style=\"color:#c0c5ce;\">test {\n\
          </span><span style=\"color:#c0c5ce;\">        </span>\
@@ -273,8 +255,10 @@ mod test_syntsx {
          </span><span style=\"color:#d08770;\">true\n\
          </span><span style=\"color:#c0c5ce;\">        }\n\
          </span><span style=\"color:#c0c5ce;\">    }\n\
-         </span><span style=\"color:#c0c5ce;\">    \n\
-         </span></code></pre>\n";
+         </span><span style=\"color:#c0c5ce;\">    </span></code></pre>\n"];
+
+        snapbox::assert_eq(expected, output.unwrap());
+    }
 
     #[test]
     fn markdown_renders_rust() {
@@ -292,7 +276,23 @@ mod test_syntsx {
             &mut buf,
             decorate_markdown(parser, syntax, Some("base16-ocean.dark")).unwrap(),
         );
-        snapbox::assert_eq(MARKDOWN_RENDERED, &buf);
+        let expected =
+        snapbox::str!["<pre style=\"background-color:#2b303b;\">\n\
+         <code><span style=\"color:#b48ead;\">mod </span>\
+         <span style=\"color:#c0c5ce;\">test {\n\
+         </span><span style=\"color:#c0c5ce;\">        </span>\
+         <span style=\"color:#b48ead;\">fn \
+         </span><span style=\"color:#8fa1b3;\">hello</span><span style=\"color:#c0c5ce;\">(\
+         </span><span style=\"color:#bf616a;\">arg</span><span style=\"color:#c0c5ce;\">: int) -&gt; \
+         </span><span style=\"color:#b48ead;\">bool </span><span style=\"color:#c0c5ce;\">{\n\
+         </span><span style=\"color:#c0c5ce;\">            \
+         </span><span style=\"color:#d08770;\">true\n\
+         </span><span style=\"color:#c0c5ce;\">        }\n\
+         </span><span style=\"color:#c0c5ce;\">    }\n\
+         </span><span style=\"color:#c0c5ce;\">    \n\
+         </span></code></pre>\n"];
+
+        snapbox::assert_eq(expected, &buf);
     }
 }
 
@@ -309,14 +309,6 @@ mod test_raw {
     }
 ";
 
-    const CODEBLOCK_RENDERED: &str = r#"<pre><code class="language-rust">mod test {
-        fn hello(arg: int) -&gt; bool {
-            true
-        }
-    }
-</code></pre>
-"#;
-
     #[test]
     fn codeblock_renders_rust() {
         let syntax = std::sync::Arc::new(SyntaxHighlight::new());
@@ -333,17 +325,18 @@ mod test_raw {
             ))
             .unwrap();
         let output = template.render(&liquid::Object::new());
-        assert_eq!(output.unwrap(), CODEBLOCK_RENDERED.to_string());
-    }
-
-    const MARKDOWN_RENDERED: &str = r#"<pre><code class="language-rust">mod test {
+        let expected = snapbox::str![
+            r#"<pre><code class="language-rust">mod test {
         fn hello(arg: int) -&gt; bool {
             true
         }
     }
-
 </code></pre>
-"#;
+"#
+        ];
+
+        snapbox::assert_eq(expected, output.unwrap());
+    }
 
     #[test]
     fn decorate_markdown_renders_rust() {
@@ -361,6 +354,17 @@ mod test_raw {
             &mut buf,
             decorate_markdown(parser, syntax, Some("base16-ocean.dark")).unwrap(),
         );
-        assert_eq!(buf, MARKDOWN_RENDERED);
+        let expected = snapbox::str![
+            r#"<pre><code class="language-rust">mod test {
+        fn hello(arg: int) -&gt; bool {
+            true
+        }
+    }
+
+</code></pre>
+"#
+        ];
+
+        snapbox::assert_eq(expected, buf);
     }
 }