diff --git a/src/book/mod.rs b/src/book/mod.rs index c8a7bfce..db5d11f3 100644 --- a/src/book/mod.rs +++ b/src/book/mod.rs @@ -268,13 +268,12 @@ impl MDBook { if let BookItem::Chapter(ref ch) = *item { if !ch.path.as_os_str().is_empty() { let path = self.source_dir().join(&ch.path); - let content = utils::fs::file_to_string(&path)?; info!("Testing file: {:?}", path); // write preprocessed file to tempdir let path = temp_dir.path().join(&ch.path); let mut tmpf = utils::fs::create_file(&path)?; - tmpf.write_all(content.as_bytes())?; + tmpf.write_all(ch.content.as_bytes())?; let output = Command::new("rustdoc") .arg(&path) diff --git a/tests/dummy_book/mod.rs b/tests/dummy_book/mod.rs index 332c1f6f..6ef2c557 100644 --- a/tests/dummy_book/mod.rs +++ b/tests/dummy_book/mod.rs @@ -53,8 +53,11 @@ impl DummyBook { })?; let sub_pattern = if self.passing_test { "true" } else { "false" }; - let file_containing_test = temp.path().join("src/first/nested.md"); - replace_pattern_in_file(&file_containing_test, "$TEST_STATUS", sub_pattern)?; + let files_containing_tests = ["src/first/nested.md", "src/first/nested-test.rs"]; + for file in &files_containing_tests { + let path_containing_tests = temp.path().join(file); + replace_pattern_in_file(&path_containing_tests, "$TEST_STATUS", sub_pattern)?; + } Ok(temp) } diff --git a/tests/dummy_book/src/first/nested-test.rs b/tests/dummy_book/src/first/nested-test.rs new file mode 100644 index 00000000..2bc46e01 --- /dev/null +++ b/tests/dummy_book/src/first/nested-test.rs @@ -0,0 +1 @@ +assert!($TEST_STATUS); diff --git a/tests/dummy_book/src/first/nested.md b/tests/dummy_book/src/first/nested.md index a7a1cdda..ba064aaf 100644 --- a/tests/dummy_book/src/first/nested.md +++ b/tests/dummy_book/src/first/nested.md @@ -7,3 +7,7 @@ assert!($TEST_STATUS); ``` ## Some Section + +```rust +{{#include nested-test.rs}} +``` diff --git a/tests/searchindex_fixture.json b/tests/searchindex_fixture.json index 41726980..824c8473 100644 --- a/tests/searchindex_fixture.json +++ b/tests/searchindex_fixture.json @@ -76,7 +76,7 @@ "title": 2 }, "5": { - "body": 0, + "body": 1, "breadcrumbs": 3, "title": 1 }, @@ -169,7 +169,7 @@ "title": "Nested Chapter" }, "5": { - "body": "", + "body": "assert!(true);", "breadcrumbs": "First Chapter ยป Some Section", "id": "5", "title": "Some Section" @@ -269,10 +269,13 @@ "df": 0, "docs": {}, "u": { - "df": 1, + "df": 2, "docs": { "4": { "tf": 1.0 + }, + "5": { + "tf": 1.0 } } } @@ -1872,10 +1875,13 @@ "df": 0, "docs": {}, "u": { - "df": 1, + "df": 2, "docs": { "4": { "tf": 1.0 + }, + "5": { + "tf": 1.0 } } }