(fix) fix partial included on evaluation [#146]

Signed-off-by: Ning Sun <sunng@about.me>
sunng87 · Apr 14, 2017 · 765fd2a · 765fd2a
1 parent db5cc8d
commit 765fd2a
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/render.rs b/src/render.rs
@@ -688,9 +688,12 @@ impl Renderable for TemplateElement {
                 }
             }
             DirectiveExpression(_) |
-            DirectiveBlock(_) |
-            PartialExpression(_) |
-            PartialBlock(_) => self.eval(registry, rc),
+            DirectiveBlock(_) => self.eval(registry, rc),
+            #[cfg(not(feature="partial_legacy"))]
+            PartialExpression(ref dt) | PartialBlock(ref dt) => {
+                Directive::from_template(dt, registry, rc)
+                    .and_then(|di| partial::expand_partial(&di, registry, rc))
+            }
             _ => Ok(()),
         }
     }
@@ -710,11 +713,6 @@ impl Evaluable for TemplateElement {
                     }
                 })
             }
-            #[cfg(not(feature="partial_legacy"))]
-            PartialExpression(ref dt) | PartialBlock(ref dt) => {
-                Directive::from_template(dt, registry, rc)
-                    .and_then(|di| partial::expand_partial(&di, registry, rc))
-            }
             _ => Ok(()),
         }
     }
@@ -907,3 +905,16 @@ fn test_render_error_line_no() {
         panic!("Error expected");
     }
 }
+
+#[test]
+#[cfg(not(feature="partial_legacy"))]
+fn test_partial_failback_render() {
+    let mut r = Registry::new();
+
+    assert!(r.register_template_string("parent", "<html>{{> layout}}</html>").is_ok());
+    assert!(r.register_template_string("child", "{{#*inline \"layout\"}}content{{/inline}}{{#> parent}}{{> seg}}{{/parent}}").is_ok());
+    assert!(r.register_template_string("seg", "1234").is_ok());
+
+    let r = r.render("child", &true).expect("should work");
+    assert_eq!(r, "<html>content</html>");
+}