diff --git a/src/items/weekday.rs b/src/items/weekday.rs index 77d0cc9..1efe52f 100644 --- a/src/items/weekday.rs +++ b/src/items/weekday.rs @@ -70,7 +70,7 @@ pub(super) fn parse(input: &mut &str) -> ModalResult { } fn day(input: &mut &str) -> ModalResult { - s(alpha1) + s((alpha1, opt('.')).take()) .verify_map(|s: &str| { Some(match s { "monday" | "mon" | "mon." => Day::Monday, diff --git a/src/lib.rs b/src/lib.rs index 86d8ca3..96a3962 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -535,6 +535,35 @@ mod tests { "2023-04-24 00:00:00 000000000" ); } + + #[test] + fn test_weekday_abbreviation_with_period() { + let date = "2023-02-28 10:12:03" + .parse::() + .unwrap() + .to_zoned(TimeZone::system()) + .unwrap(); + + for (weekday, expected) in [ + ("mon.", "2023-03-06 00:00:00 000000000"), + ("tue.", "2023-02-28 00:00:00 000000000"), + ("wed.", "2023-03-01 00:00:00 000000000"), + ("thu.", "2023-03-02 00:00:00 000000000"), + ("fri.", "2023-03-03 00:00:00 000000000"), + ("sat.", "2023-03-04 00:00:00 000000000"), + ("sun.", "2023-03-05 00:00:00 000000000"), + ] { + assert_eq!(get_formatted_date(&date, weekday), expected, "{weekday}"); + } + + for (input, expected) in [ + ("wed., 2024-01-03", "2024-01-03 00:00:00"), + ("mon., 2024-01-03", "2024-01-03 00:00:00"), + ] { + let actual = crate::parse_datetime(input).unwrap().expect_in_range(); + assert_eq!(actual.strftime("%F %T").to_string(), expected, "{input}"); + } + } } #[cfg(test)]