From 011365d37165eabeb54c34654668841aa2a8e751 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Wed, 7 Dec 2022 15:48:54 +0100 Subject: [PATCH] Avoid extra newline in YAML snapshots. Fixes #311 --- src/content/yaml.rs | 4 +++- tests/snapshots/test_settings__snapshot_with_description.snap | 2 +- .../test_settings__snapshot_with_description_and_info.snap | 2 +- ...test_settings__snapshot_with_description_and_raw_info.snap | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/content/yaml.rs b/src/content/yaml.rs index b015a92a..ede5a286 100644 --- a/src/content/yaml.rs +++ b/src/content/yaml.rs @@ -47,7 +47,9 @@ pub fn to_string(content: &Content) -> String { let mut emitter = yaml_rust::YamlEmitter::new(&mut buf); emitter.dump(&yaml_blob).unwrap(); - buf.push('\n'); + if !buf.ends_with('\n') { + buf.push('\n'); + } buf } diff --git a/tests/snapshots/test_settings__snapshot_with_description.snap b/tests/snapshots/test_settings__snapshot_with_description.snap index fff915eb..e94ccdbb 100644 --- a/tests/snapshots/test_settings__snapshot_with_description.snap +++ b/tests/snapshots/test_settings__snapshot_with_description.snap @@ -1,7 +1,7 @@ --- source: tests/test_settings.rs -expression: "vec![1, 2, 3]" description: The snapshot is three integers +expression: "vec![1, 2, 3]" --- [ 1, diff --git a/tests/snapshots/test_settings__snapshot_with_description_and_info.snap b/tests/snapshots/test_settings__snapshot_with_description_and_info.snap index 61efba1e..1e1acd04 100644 --- a/tests/snapshots/test_settings__snapshot_with_description_and_info.snap +++ b/tests/snapshots/test_settings__snapshot_with_description_and_info.snap @@ -1,7 +1,7 @@ --- source: tests/test_settings.rs -expression: "vec![1, 2, 3, 4]" description: The snapshot is four integers +expression: "vec![1, 2, 3, 4]" info: env: ENVIRONMENT: production diff --git a/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap b/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap index 5431bbb3..14349e18 100644 --- a/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap +++ b/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap @@ -1,7 +1,7 @@ --- source: tests/test_settings.rs -expression: "vec![1, 2, 3, 4]" description: The snapshot is four integers +expression: "vec![1, 2, 3, 4]" info: env: - ENVIRONMENT