Skip to content

Make today/tomorrow/yesterday at the beginning of the day #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aviadl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make today/tomorrow/yesterday at the beginning of the day #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82c3592
Make today/tomorrow/yesterday at the beginning of the day
Jan 17, 2019
1447fa5
Update rules/en/casual_test.go
Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion rules/en/casual_date.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,23 @@ func CasualDate(s rules.Strategy) rules.Rule {
c.Minute = pointer.ToInt(0)
}
case strings.Contains(lower, "today"):
// c.Hour = pointer.ToInt(18)
c.Hour = pointer.ToInt(0)
c.Minute = pointer.ToInt(0)
c.Second = pointer.ToInt(0)
case strings.Contains(lower, "tomorrow"), strings.Contains(lower, "tmr"):
if c.Duration == 0 || overwrite {
c.Duration += time.Hour * 24
}
c.Hour = pointer.ToInt(0)
c.Minute = pointer.ToInt(0)
c.Second = pointer.ToInt(0)
case strings.Contains(lower, "yesterday"):
if c.Duration == 0 || overwrite {
c.Duration -= time.Hour * 24
}
c.Hour = pointer.ToInt(0)
c.Minute = pointer.ToInt(0)
c.Second = pointer.ToInt(0)
case strings.Contains(lower, "last night"):
if (c.Hour == nil && c.Duration == 0) || overwrite {
c.Hour = pointer.ToInt(23)
Expand Down
38 changes: 38 additions & 0 deletions rules/en/casual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package en_test

import (
"github.com/olebedev/when/rules/common"
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/en"
"github.com/stretchr/testify/assert"
)

func TestCasualDate(t *testing.T) {
Expand All @@ -24,6 +26,42 @@ func TestCasualDate(t *testing.T) {
ApplyFixtures(t, "en.CasualDate", w, fixt)
}

func TestTodayTomorrowYesterday(t *testing.T) {
var w = when.New(nil)
w.Add(en.All...)
w.Add(common.All...)
now := time.Now()
r, err := w.Parse("today", now)
assert.EqualValues(t, now.Year(), r.Time.Year())
assert.EqualValues(t, now.Month(), r.Time.Month())
assert.EqualValues(t, now.Day(), r.Time.Day())
assert.EqualValues(t, 0, r.Time.Minute())
assert.EqualValues(t, 0, r.Time.Hour())
assert.EqualValues(t, 0, r.Time.Second())
r, err = w.Parse("yesterday", now)
if err != nil {
t.Fail()
}
assert.EqualValues(t, now.Year(), r.Time.Year())
assert.EqualValues(t, now.Month(), r.Time.Month())
assert.EqualValues(t, now.Day()-1, r.Time.Day())
assert.EqualValues(t, 0, r.Time.Minute())
assert.EqualValues(t, 0, r.Time.Hour())
assert.EqualValues(t, 0, r.Time.Second())

r, err = w.Parse("tomorrow", now)
if err != nil {
t.Fail()
}
assert.EqualValues(t, now.Year(), r.Time.Year())
assert.EqualValues(t, now.Month(), r.Time.Month())
assert.EqualValues(t, now.Day()+1, r.Time.Day())
assert.EqualValues(t, 0, r.Time.Minute())
assert.EqualValues(t, 0, r.Time.Hour())
assert.EqualValues(t, 0, r.Time.Second())

}

func TestCasualTime(t *testing.T) {
fixt := []Fixture{
{"The Deadline was this morning ", 17, "this morning", 8 * time.Hour},
Expand Down