From bdd16e25fa8660af945185363ee53ea4cd31f150 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 22 Apr 2025 11:13:03 -0700 Subject: [PATCH] Migrate copy-fonts=false empty fonts.css to BookTest --- tests/rendered_output.rs | 13 ------------- tests/testsuite/theme.rs | 15 +++++++++++++++ .../book.toml | 2 ++ .../src/SUMMARY.md | 1 + .../theme/fonts/fonts.css | 0 5 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/book.toml create mode 100644 tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/src/SUMMARY.md create mode 100644 tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/theme/fonts/fonts.css diff --git a/tests/rendered_output.rs b/tests/rendered_output.rs index 12b07ad7..cc22e650 100644 --- a/tests/rendered_output.rs +++ b/tests/rendered_output.rs @@ -323,19 +323,6 @@ fn custom_fonts() { contents.contains("fonts/fonts.css") }; - // copy-fonts=false with empty fonts.css - let temp = TempFileBuilder::new().prefix("mdbook").tempdir().unwrap(); - let p = temp.path(); - MDBook::init(p).build().unwrap(); - write_file(&p.join("theme/fonts"), "fonts.css", b"").unwrap(); - let config = Config::from_str("output.html.copy-fonts = false").unwrap(); - MDBook::load_with_config(p, config) - .unwrap() - .build() - .unwrap(); - assert!(!has_fonts_css(p)); - assert!(!p.join("book/fonts").exists()); - // copy-fonts=false with fonts theme let temp = TempFileBuilder::new().prefix("mdbook").tempdir().unwrap(); let p = temp.path(); diff --git a/tests/testsuite/theme.rs b/tests/testsuite/theme.rs index 9916c4d2..f4b0c7b7 100644 --- a/tests/testsuite/theme.rs +++ b/tests/testsuite/theme.rs @@ -155,3 +155,18 @@ Add an empty `theme/fonts/fonts.css` file to squelch this warning. .check_file_doesnt_contain("book/index.html", "fonts.css") .check_file_list("book/fonts", str![[""]]); } + +// copy-fonts=false, empty fonts.css +#[test] +fn copy_fonts_false_with_empty_fonts_css() { + BookTest::from_dir("theme/copy_fonts_false_with_empty_fonts_css") + .run("build", |cmd| { + cmd.expect_stderr(str![[r#" +[TIMESTAMP] [INFO] (mdbook::book): Book building has started +[TIMESTAMP] [INFO] (mdbook::book): Running the html backend + +"#]]); + }) + .check_file_doesnt_contain("book/index.html", "fonts.css") + .check_file_list("book/fonts", str![[""]]); +} diff --git a/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/book.toml b/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/book.toml new file mode 100644 index 00000000..e4929c83 --- /dev/null +++ b/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/book.toml @@ -0,0 +1,2 @@ +[output.html] +copy-fonts = false diff --git a/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/src/SUMMARY.md b/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/src/SUMMARY.md new file mode 100644 index 00000000..655a0ded --- /dev/null +++ b/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/src/SUMMARY.md @@ -0,0 +1 @@ +- [Intro](index.md) diff --git a/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/theme/fonts/fonts.css b/tests/testsuite/theme/copy_fonts_false_with_empty_fonts_css/theme/fonts/fonts.css new file mode 100644 index 00000000..e69de29b