diff --git a/htmlua-parser/src/render.rs b/htmlua-parser/src/render.rs index 58a8259..d50e934 100644 --- a/htmlua-parser/src/render.rs +++ b/htmlua-parser/src/render.rs @@ -188,6 +188,37 @@ mod tests { assert!(d.select_first("include").is_err()); } + #[test] + fn basic_lua_include() { + let page = r#" + + + + Basic HTML Page + + +

Hello World

+

This is a paragraph.

+ + htmlua.println("Test from Lua!") + + + + "#; + let mut p = PathBuf::from(env!("CARGO_MANIFEST_DIR")); + p.push("tests/components"); + let document = kuchikiki::parse_html().one(page); + let d = execute_lua(expand_template(document, &p, None).unwrap()).unwrap(); + let text = d.select_first("span").unwrap().as_node().text_contents(); + println!("{}", d.to_string()); + assert_eq!(text, "Test from Lua!\n"); + assert!(d.select_first("lua").is_err()); + let text = d.select_first("#inc1").unwrap().as_node().text_contents(); + assert_eq!(text, "included1"); + assert!(d.select_first("include").is_err()); + + } + #[test] fn recursive_include() { let page = r#" diff --git a/htmlua-parser/src/serve.rs b/htmlua-parser/src/serve.rs index 1dfd306..134cc13 100644 --- a/htmlua-parser/src/serve.rs +++ b/htmlua-parser/src/serve.rs @@ -16,8 +16,8 @@ pub fn serve_content(request_uri: &str) -> Result { let page_string = read_to_string(&page_path)?; let doc = kuchikiki::parse_html().one(page_string); - let full_doc = expand_template(doc, &components, None)?; + let full_doc = expand_template(doc, &components, None)?; let executed_doc = execute_lua(full_doc)?; Ok(executed_doc.to_string()) diff --git a/htmlua-parser/tests/components/comp1.html b/htmlua-parser/tests/components/comp1.html index 516d00e..4110604 100644 --- a/htmlua-parser/tests/components/comp1.html +++ b/htmlua-parser/tests/components/comp1.html @@ -1 +1 @@ -included1 +included1