diff --git a/crates/docx/src/write/settings_merge.rs b/crates/docx/src/write/settings_merge.rs index 01b7d27c6..a72046e83 100644 --- a/crates/docx/src/write/settings_merge.rs +++ b/crates/docx/src/write/settings_merge.rs @@ -390,16 +390,18 @@ mod tests { #[test] fn gutter_at_top_comes_from_the_generated_part() { - let orig = r#""#; + let orig = + r#""#; assert!(has_unowned(orig.as_bytes())); // Turned off in the model: the original element goes, the foreign one stays. let out = String::from_utf8(merge(orig.as_bytes(), GEN.as_bytes()).unwrap()).unwrap(); assert!(!out.contains("gutterAtTop") && out.contains("").count(), 1, "{out}"); - assert!(out.find("") < out.find("") && out.find("") < out.find("") < at("") && at("") < at(""#)); } diff --git a/crates/docx/tests/it/roundtrip.rs b/crates/docx/tests/it/roundtrip.rs index 3ba2f326a..4bb6cab35 100644 --- a/crates/docx/tests/it/roundtrip.rs +++ b/crates/docx/tests/it/roundtrip.rs @@ -2981,6 +2981,8 @@ fn gutter_at_top_reads_every_value_spelling() { (r#""#, false), (r#""#, false), (r#""#, false), + (r#""#, false), + (r#""#, false), ] { let file = replace_part(&plain, "word/settings.xml", xml.replace(zoom, &format!("{zoom}{element}")).as_bytes()); assert_eq!(craft_docx::read(&file).unwrap().settings.gutter_at_top, expected, "{element:?}"); @@ -2997,9 +2999,8 @@ fn gutter_at_top_is_merged_into_a_foreign_settings_part() { let xml = settings_part(&plain); let zoom = r#""#; let foreign = |element: &str| { - let extra = format!( - r#"{zoom}{element}"# - ); + let extra = + format!(r#"{zoom}{element}"#); replace_part(&plain, "word/settings.xml", xml.replace(zoom, &extra).as_bytes()) };