From 2289b2f55a90f4ad76eb5c72d99189e7197f0643 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Wed, 2 Jun 2021 21:46:19 +0200 Subject: [PATCH] Fix config loading Closes #1512 --- components/config/src/config/mod.rs | 16 ++- components/library/src/content/page.rs | 18 +-- components/rendering/src/shortcode.rs | 2 +- .../rendering/tests/codeblock_hide_lines.rs | 2 +- .../rendering/tests/codeblock_hl_lines.rs | 26 ++-- components/rendering/tests/markdown.rs | 126 +++++++++--------- components/search/src/lib.rs | 18 ++- 7 files changed, 110 insertions(+), 98 deletions(-) diff --git a/components/config/src/config/mod.rs b/components/config/src/config/mod.rs index b1cad9b1..19971e68 100644 --- a/components/config/src/config/mod.rs +++ b/components/config/src/config/mod.rs @@ -151,6 +151,12 @@ impl Config { Ok(config) } + pub fn default_for_test() -> Self { + let mut config = Config::default(); + config.add_default_language(); + config + } + /// Parses a config file from the given path pub fn from_file>(path: P) -> Result { let path = path.as_ref(); @@ -184,7 +190,7 @@ impl Config { } /// Adds the default language to the list of languages if not present - fn add_default_language(&mut self) { + pub fn add_default_language(&mut self) { // We automatically insert a language option for the default language *if* it isn't present // TODO: what to do if there is like an empty dict for the lang? merge it or use the language // TODO: as source of truth? @@ -193,7 +199,7 @@ impl Config { self.default_language.clone(), languages::LanguageOptions { title: self.title.clone(), - description: self.title.clone(), + description: self.description.clone(), generate_feed: self.generate_feed, build_search_index: self.build_search_index, taxonomies: self.taxonomies.clone(), @@ -319,7 +325,7 @@ pub fn merge(into: &mut Toml, from: &Toml) -> Result<()> { impl Default for Config { fn default() -> Config { - let mut config = Config { + Config { base_url: DEFAULT_BASE_URL.to_string(), title: None, description: None, @@ -344,9 +350,7 @@ impl Default for Config { search: search::Search::default(), markdown: markup::Markdown::default(), extra: HashMap::new(), - }; - config.add_default_language(); - config + } } } diff --git a/components/library/src/content/page.rs b/components/library/src/content/page.rs index 9f5e2667..d0937187 100644 --- a/components/library/src/content/page.rs +++ b/components/library/src/content/page.rs @@ -353,7 +353,8 @@ mod tests { use utils::slugs::SlugifyStrategy; #[test] - fn test_can_parse_a_valid_page() { + fn can_parse_a_valid_page() { + let config = Config::default_for_test(); let content = r#" +++ title = "Hello" @@ -361,16 +362,11 @@ description = "hey there" slug = "hello-world" +++ Hello world"#; - let res = Page::parse(Path::new("post.md"), content, &Config::default(), &PathBuf::new()); + let res = Page::parse(Path::new("post.md"), content, &config, &PathBuf::new()); assert!(res.is_ok()); let mut page = res.unwrap(); - page.render_markdown( - &HashMap::default(), - &Tera::default(), - &Config::default(), - InsertAnchor::None, - ) - .unwrap(); + page.render_markdown(&HashMap::default(), &Tera::default(), &config, InsertAnchor::None) + .unwrap(); assert_eq!(page.meta.title.unwrap(), "Hello".to_string()); assert_eq!(page.meta.slug.unwrap(), "hello-world".to_string()); @@ -525,7 +521,7 @@ Hello world"#; #[test] fn can_specify_summary() { - let config = Config::default(); + let config = Config::default_for_test(); let content = r#" +++ +++ @@ -542,7 +538,7 @@ Hello world #[test] fn strips_footnotes_in_summary() { - let config = Config::default(); + let config = Config::default_for_test(); let content = r#" +++ +++ diff --git a/components/rendering/src/shortcode.rs b/components/rendering/src/shortcode.rs index 298b9a4e..43124455 100644 --- a/components/rendering/src/shortcode.rs +++ b/components/rendering/src/shortcode.rs @@ -268,7 +268,7 @@ mod tests { } fn render_shortcodes(code: &str, tera: &Tera) -> String { - let config = Config::default(); + let config = Config::default_for_test(); let permalinks = HashMap::new(); let context = RenderContext::new( &tera, diff --git a/components/rendering/tests/codeblock_hide_lines.rs b/components/rendering/tests/codeblock_hide_lines.rs index 308f2f14..c753c429 100644 --- a/components/rendering/tests/codeblock_hide_lines.rs +++ b/components/rendering/tests/codeblock_hide_lines.rs @@ -30,7 +30,7 @@ macro_rules! colored_html { fn hide_lines_simple() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, diff --git a/components/rendering/tests/codeblock_hl_lines.rs b/components/rendering/tests/codeblock_hl_lines.rs index 23db55be..ef4e5f2f 100644 --- a/components/rendering/tests/codeblock_hl_lines.rs +++ b/components/rendering/tests/codeblock_hl_lines.rs @@ -36,7 +36,7 @@ macro_rules! colored_html { fn hl_lines_simple() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -72,7 +72,7 @@ baz fn hl_lines_in_middle() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -108,7 +108,7 @@ baz fn hl_lines_all() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -142,7 +142,7 @@ baz fn hl_lines_start_from_one() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -177,7 +177,7 @@ baz fn hl_lines_start_from_zero() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -212,7 +212,7 @@ baz fn hl_lines_end() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -247,7 +247,7 @@ baz fn hl_lines_end_out_of_bounds() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -282,7 +282,7 @@ baz fn hl_lines_overlap() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -316,7 +316,7 @@ baz fn hl_lines_multiple() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -351,7 +351,7 @@ baz fn hl_lines_extra_spaces() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -386,7 +386,7 @@ baz fn hl_lines_int_and_range() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -422,7 +422,7 @@ baz fn hl_lines_single_line_range() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -458,7 +458,7 @@ baz fn hl_lines_reverse_range() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, diff --git a/components/rendering/tests/markdown.rs b/components/rendering/tests/markdown.rs index 0c6296c0..98765f56 100644 --- a/components/rendering/tests/markdown.rs +++ b/components/rendering/tests/markdown.rs @@ -12,7 +12,7 @@ use utils::slugs::SlugifyStrategy; fn can_do_render_content_simple() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -29,7 +29,7 @@ fn can_do_render_content_simple() { fn doesnt_highlight_code_block_with_highlighting_off() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = false; let context = RenderContext::new( &tera_ctx, @@ -47,7 +47,7 @@ fn doesnt_highlight_code_block_with_highlighting_off() { fn can_highlight_code_block_no_lang() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -68,7 +68,7 @@ fn can_highlight_code_block_no_lang() { fn can_highlight_code_block_with_lang() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -89,7 +89,7 @@ fn can_highlight_code_block_with_lang() { fn can_higlight_code_block_with_unknown_lang() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = true; let context = RenderContext::new( &tera_ctx, @@ -110,7 +110,7 @@ fn can_higlight_code_block_with_unknown_lang() { #[test] fn can_render_shortcode() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -137,7 +137,7 @@ Hello #[test] fn can_render_shortcode_with_markdown_char_in_args_name() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -157,7 +157,7 @@ fn can_render_shortcode_with_markdown_char_in_args_name() { #[test] fn can_render_shortcode_with_markdown_char_in_args_value() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -187,7 +187,7 @@ fn can_render_body_shortcode_with_markdown_char_in_name() { let mut tera = Tera::default(); tera.extend(&ZOLA_TERA).unwrap(); let input = vec!["quo_te", "qu_o_te"]; - let config = Config::default(); + let config = Config::default_for_test(); for i in input { tera.add_raw_template( @@ -232,7 +232,7 @@ Here is another paragraph. "; tera.add_raw_template("shortcodes/figure.html", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -272,7 +272,7 @@ Here is another paragraph. "; tera.add_raw_template("shortcodes/figure.html", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -290,7 +290,7 @@ Here is another paragraph. #[test] fn can_render_several_shortcode_in_row() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -331,7 +331,7 @@ Hello #[test] fn doesnt_render_ignored_shortcodes() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.highlight_code = false; let context = RenderContext::new( &ZOLA_TERA, @@ -355,7 +355,7 @@ fn can_render_shortcode_with_body() { ) .unwrap(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -382,7 +382,7 @@ A quote fn errors_rendering_unknown_shortcode() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -400,7 +400,7 @@ fn can_make_valid_relative_link() { let mut permalinks = HashMap::new(); permalinks.insert("pages/about.md".to_string(), "https://vincent.is/about".to_string()); let tera_ctx = Tera::default(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -425,7 +425,7 @@ fn can_make_relative_links_with_anchors() { let mut permalinks = HashMap::new(); permalinks.insert("pages/about.md".to_string(), "https://vincent.is/about".to_string()); let tera_ctx = Tera::default(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -443,7 +443,7 @@ fn can_make_relative_links_with_anchors() { fn errors_relative_link_inexistant() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -460,7 +460,7 @@ fn errors_relative_link_inexistant() { fn can_add_id_to_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -477,7 +477,7 @@ fn can_add_id_to_headings() { fn can_add_id_to_headings_same_slug() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -494,7 +494,7 @@ fn can_add_id_to_headings_same_slug() { fn can_add_non_slug_id_to_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.slugify.anchors = SlugifyStrategy::Safe; let context = RenderContext::new( &tera_ctx, @@ -512,7 +512,7 @@ fn can_add_non_slug_id_to_headings() { fn can_handle_manual_ids_on_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -556,7 +556,7 @@ fn can_handle_manual_ids_on_headings() { fn blank_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -575,7 +575,7 @@ fn blank_headings() { #[test] fn can_insert_anchor_left() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -594,7 +594,7 @@ fn can_insert_anchor_left() { #[test] fn can_insert_anchor_right() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -613,7 +613,7 @@ fn can_insert_anchor_right() { #[test] fn can_insert_anchor_for_multi_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -634,7 +634,7 @@ fn can_insert_anchor_for_multi_heading() { #[test] fn can_insert_anchor_with_exclamation_mark() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -654,7 +654,7 @@ fn can_insert_anchor_with_exclamation_mark() { #[test] fn can_insert_anchor_with_link() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -673,7 +673,7 @@ fn can_insert_anchor_with_link() { #[test] fn can_insert_anchor_with_other_special_chars() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -692,7 +692,7 @@ fn can_insert_anchor_with_other_special_chars() { #[test] fn can_make_toc() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -725,7 +725,7 @@ fn can_make_toc() { #[test] fn can_ignore_tags_in_toc() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -762,7 +762,7 @@ fn can_ignore_tags_in_toc() { #[test] fn can_understand_backtick_in_titles() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -778,7 +778,7 @@ fn can_understand_backtick_in_titles() { #[test] fn can_understand_backtick_in_paragraphs() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -795,7 +795,7 @@ fn can_understand_backtick_in_paragraphs() { #[test] fn can_understand_links_in_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -811,7 +811,7 @@ fn can_understand_links_in_heading() { #[test] fn can_understand_link_with_title_in_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -831,7 +831,7 @@ fn can_understand_link_with_title_in_heading() { #[test] fn can_understand_emphasis_in_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -847,7 +847,7 @@ fn can_understand_emphasis_in_heading() { #[test] fn can_understand_strong_in_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -863,7 +863,7 @@ fn can_understand_strong_in_heading() { #[test] fn can_understand_code_in_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -880,7 +880,7 @@ fn can_understand_code_in_heading() { #[test] fn can_understand_footnote_in_heading() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -905,7 +905,7 @@ fn can_make_valid_relative_link_in_heading() { let mut permalinks = HashMap::new(); permalinks.insert("pages/about.md".to_string(), "https://vincent.is/about/".to_string()); let tera_ctx = Tera::default(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -925,7 +925,7 @@ fn can_make_valid_relative_link_in_heading() { #[test] fn can_make_permalinks_with_colocated_assets_for_link() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -941,7 +941,7 @@ fn can_make_permalinks_with_colocated_assets_for_link() { #[test] fn can_make_permalinks_with_colocated_assets_for_image() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -960,7 +960,7 @@ fn can_make_permalinks_with_colocated_assets_for_image() { #[test] fn markdown_doesnt_wrap_html_in_paragraph() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -993,7 +993,7 @@ Some text #[test] fn correctly_captures_external_links() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -1019,7 +1019,7 @@ Email: fn can_handle_summaries() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera_ctx, &config, @@ -1074,7 +1074,7 @@ fn doesnt_try_to_highlight_content_from_shortcode() { let expected = "
\n \n \"Some\n \n\n
Some spheres.
\n
"; tera.add_raw_template("shortcodes/figure.html", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1103,7 +1103,7 @@ fn can_emit_newlines_and_whitespace_with_shortcode() { let expected = "
\nHello\n    \n    Zola\n   \n  !\n
"; tera.add_raw_template(&format!("shortcodes/{}.html", "preformatted"), shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1138,7 +1138,7 @@ fn can_emit_newlines_and_whitespace_with_shortcode() { // let expected = r#"

["multi", "ple", "lines"]

"#; // // tera.add_raw_template(&format!("shortcodes/{}.html", "alert"), shortcode).unwrap(); -// let config = Config::default(); +// let config = Config::default_for_test(); // let context = RenderContext::new(&tera, &config, &config.default_language, "", &permalinks_ctx, InsertAnchor::None); // // let res = render_content(markdown_string, &context).unwrap(); @@ -1157,7 +1157,7 @@ fn leaves_custom_url_scheme_untouched() { "#; let tera_ctx = Tera::default(); - let config = Config::default(); + let config = Config::default_for_test(); let permalinks_ctx = HashMap::new(); let context = RenderContext::new( @@ -1184,7 +1184,7 @@ fn stops_with_an_error_on_an_empty_link() { let content = r#"[some link]()"#; let tera_ctx = Tera::default(); - let config = Config::default(); + let config = Config::default_for_test(); let permalinks_ctx = HashMap::new(); let context = RenderContext::new( @@ -1237,7 +1237,7 @@ Bla bla"#; "#; tera.add_raw_template("shortcodes/quote.md", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1274,7 +1274,7 @@ fn can_render_shortcode_body_with_no_invalid_escaping() { let expected = "\n \n \n

(click for full size)

\n"; tera.add_raw_template("shortcodes/resize_image.html", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1310,7 +1310,7 @@ fn can_render_commented_out_shortcodes_fine() { let expected = ""; tera.add_raw_template("shortcodes/resize_image.html", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1349,7 +1349,7 @@ Again more text"#; "#; tera.add_raw_template("shortcodes/quote.md", shortcode).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1366,7 +1366,7 @@ Again more text"#; #[test] fn can_render_emoji_alias() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.render_emoji = true; let context = RenderContext::new( &ZOLA_TERA, @@ -1383,7 +1383,7 @@ fn can_render_emoji_alias() { #[test] fn emoji_aliases_are_ignored_when_disabled_in_config() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -1419,7 +1419,7 @@ fn invocation_count_increments_in_shortcode() { tera.add_raw_template("shortcodes/a.html", shortcode_template_a).unwrap(); tera.add_raw_template("shortcodes/b.html", shortcode_template_b).unwrap(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &tera, &config, @@ -1436,7 +1436,7 @@ fn invocation_count_increments_in_shortcode() { #[test] fn basic_external_links_unchanged() { let permalinks_ctx = HashMap::new(); - let config = Config::default(); + let config = Config::default_for_test(); let context = RenderContext::new( &ZOLA_TERA, &config, @@ -1452,7 +1452,7 @@ fn basic_external_links_unchanged() { #[test] fn can_set_target_blank_for_external_link() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.external_links_target_blank = true; let context = RenderContext::new( &ZOLA_TERA, @@ -1469,7 +1469,7 @@ fn can_set_target_blank_for_external_link() { #[test] fn can_set_nofollow_for_external_link() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.external_links_no_follow = true; let context = RenderContext::new( &ZOLA_TERA, @@ -1490,7 +1490,7 @@ fn can_set_nofollow_for_external_link() { #[test] fn can_set_noreferrer_for_external_link() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.external_links_no_referrer = true; let context = RenderContext::new( &ZOLA_TERA, @@ -1510,7 +1510,7 @@ fn can_set_noreferrer_for_external_link() { #[test] fn can_set_all_options_for_external_link() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.external_links_target_blank = true; config.markdown.external_links_no_follow = true; config.markdown.external_links_no_referrer = true; @@ -1529,7 +1529,7 @@ fn can_set_all_options_for_external_link() { #[test] fn can_use_smart_punctuation() { let permalinks_ctx = HashMap::new(); - let mut config = Config::default(); + let mut config = Config::default_for_test(); config.markdown.smart_punctuation = true; let context = RenderContext::new( &ZOLA_TERA, diff --git a/components/search/src/lib.rs b/components/search/src/lib.rs index a91f9587..58e39a30 100644 --- a/components/search/src/lib.rs +++ b/components/search/src/lib.rs @@ -1,8 +1,8 @@ use std::collections::{HashMap, HashSet}; -use elasticlunr::{Index, Language}; use elasticlunr::pipeline; use elasticlunr::pipeline::TokenizerFn; +use elasticlunr::{Index, Language}; use lazy_static::lazy_static; use config::{Config, Search}; @@ -140,7 +140,13 @@ pub fn build_index(lang: &str, library: &Library, config: &Config) -> Result