summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib.rs2
-rw-r--r--tests/tests.rs44
2 files changed, 44 insertions, 2 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 1eea2ff..0c44b73 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -180,7 +180,7 @@ extern crate pidgin;
extern crate lazy_static;
extern crate chrono;
use chrono::naive::{NaiveDate, NaiveDateTime};
-use chrono::{Date, DateTime, Datelike, Duration, Local, TimeZone, Timelike, Weekday};
+use chrono::{Datelike, Duration, Local, Timelike, Weekday};
use pidgin::{Match, Matcher};
use regex::Regex;
diff --git a/tests/tests.rs b/tests/tests.rs
index f4460b2..31ef9fb 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -3,7 +3,7 @@ extern crate two_timer;
use two_timer::{parse, Config};
extern crate chrono;
use chrono::naive::NaiveDate;
-use chrono::{Duration, Local, TimeZone, Utc};
+use chrono::{Duration, Local};
#[test]
fn always() {
@@ -982,3 +982,45 @@ fn next_weekend_on_sunday_when_sunday_starts_week() {
assert_eq!(d1, start);
assert_eq!(d2, end);
}
+
+#[test]
+fn this_weekend_on_saturday_when_sunday_starts_week() {
+ let now = NaiveDate::from_ymd(1969, 5, 10).and_hms(0, 0, 0);
+ let d1 = NaiveDate::from_ymd(1969, 5, 10).and_hms(0, 0, 0);
+ let d2 = NaiveDate::from_ymd(1969, 5, 12).and_hms(0, 0, 0);
+ let (start, end, _) = parse(
+ "this weekend",
+ Some(Config::new().now(now).monday_starts_week(false)),
+ )
+ .unwrap();
+ assert_eq!(d1, start);
+ assert_eq!(d2, end);
+}
+
+#[test]
+fn last_weekend_on_saturday_when_sunday_starts_week() {
+ let now = NaiveDate::from_ymd(1969, 5, 10).and_hms(0, 0, 0);
+ let d1 = NaiveDate::from_ymd(1969, 5, 3).and_hms(0, 0, 0);
+ let d2 = NaiveDate::from_ymd(1969, 5, 5).and_hms(0, 0, 0);
+ let (start, end, _) = parse(
+ "last weekend",
+ Some(Config::new().now(now).monday_starts_week(false)),
+ )
+ .unwrap();
+ assert_eq!(d1, start);
+ assert_eq!(d2, end);
+}
+
+#[test]
+fn next_weekend_on_saturday_when_sunday_starts_week() {
+ let now = NaiveDate::from_ymd(1969, 5, 10).and_hms(0, 0, 0);
+ let d1 = NaiveDate::from_ymd(1969, 5, 17).and_hms(0, 0, 0);
+ let d2 = NaiveDate::from_ymd(1969, 5, 19).and_hms(0, 0, 0);
+ let (start, end, _) = parse(
+ "next weekend",
+ Some(Config::new().now(now).monday_starts_week(false)),
+ )
+ .unwrap();
+ assert_eq!(d1, start);
+ assert_eq!(d2, end);
+}