From 08e62a3e9ac6400c86953175061627fb12048c82 Mon Sep 17 00:00:00 2001 From: Renato Duarte Date: Sat, 16 Apr 2022 07:38:30 +0100 Subject: [PATCH 1/3] Add tests to run --- diff_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff_test.go b/diff_test.go index f052f6f..275b5b1 100644 --- a/diff_test.go +++ b/diff_test.go @@ -84,7 +84,7 @@ func TestDiffForHumansNowAndHours(t *testing.T) { assert.Equal(t, "2 hours ago", gotTime) } -func _TestDiffForHumansNowAndNearlyDayOne(t *testing.T) { +func TestDiffForHumansNowAndNearlyDayOne(t *testing.T) { gotTime, err := Now().SubHours(743).DiffForHumans(nil, false, false, false) assert.Nil(t, err) assert.Equal(t, "4 weeks ago", gotTime) @@ -525,7 +525,7 @@ func TestDiffForHumansOtherAndLessThanFutureMonth(t *testing.T) { assert.Equal(t, "4 weeks after", gotTime) } -func _TestDiffForHumansOtherAndFutureMonth(t *testing.T) { +func TestDiffForHumansOtherAndFutureMonth(t *testing.T) { gotTime, err := Now().DiffForHumans(Now().SubMonth(), true, false, false) assert.Nil(t, err) assert.Equal(t, "1 month after", gotTime) From b6094198530f2a7ba2e545792c84480192577123 Mon Sep 17 00:00:00 2001 From: Renato Duarte Date: Sat, 16 Apr 2022 08:29:40 +0100 Subject: [PATCH 2/3] Fix tests --- diff_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/diff_test.go b/diff_test.go index 275b5b1..1a18df2 100644 --- a/diff_test.go +++ b/diff_test.go @@ -85,7 +85,7 @@ func TestDiffForHumansNowAndHours(t *testing.T) { } func TestDiffForHumansNowAndNearlyDayOne(t *testing.T) { - gotTime, err := Now().SubHours(743).DiffForHumans(nil, false, false, false) + gotTime, err := Now().SubWeeks(4).DiffForHumans(nil, false, false, false) assert.Nil(t, err) assert.Equal(t, "4 weeks ago", gotTime) } @@ -145,10 +145,7 @@ func TestDiffForHumansNowAndNearlyMonth(t *testing.T) { } func TestDiffForHumansNowAndMonth(t *testing.T) { - gotTime, err := Now().SubWeeks(4).DiffForHumans(nil, false, false, false) - assert.Nil(t, err) - assert.Equal(t, "4 weeks ago", gotTime) - gotTime, err = Now().SubMonth().DiffForHumans(nil, false, false, false) + gotTime, err := Now().SubMonth().DiffForHumans(nil, false, false, false) assert.Nil(t, err) assert.Equal(t, "1 month ago", gotTime) } @@ -526,7 +523,7 @@ func TestDiffForHumansOtherAndLessThanFutureMonth(t *testing.T) { } func TestDiffForHumansOtherAndFutureMonth(t *testing.T) { - gotTime, err := Now().DiffForHumans(Now().SubMonth(), true, false, false) + gotTime, err := Now().AddMonth().DiffForHumans(Now(), true, false, false) assert.Nil(t, err) assert.Equal(t, "1 month after", gotTime) } From fb09e0ae4225e944d3cf23bd9548ec696fc52739 Mon Sep 17 00:00:00 2001 From: Renato Duarte Date: Sat, 16 Apr 2022 08:57:33 +0100 Subject: [PATCH 3/3] Add tests to cover issue #57 and #54 --- diff_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/diff_test.go b/diff_test.go index 1a18df2..1f08f69 100644 --- a/diff_test.go +++ b/diff_test.go @@ -562,6 +562,12 @@ func TestDiffForHumansAbsoluteSeconds(t *testing.T) { assert.Equal(t, "59 seconds", gotTime2) } +func TestDiffForOneMinute(t *testing.T) { + gotTime, err := Now().SubMinute().DiffForHumans(nil, false, false, false) + assert.Nil(t, err) + assert.Equal(t, "1 minute ago", gotTime) +} + func TestDiffForHumansAbsoluteMinutes(t *testing.T) { gotTime, err := Now().DiffForHumans(Now().SubMinutes(30), true, true, false) assert.Nil(t, err) @@ -582,6 +588,16 @@ func TestDiffForHumansAbsoluteHours(t *testing.T) { assert.Equal(t, "3 hours", gotTime2) } +func TestForDiffInHours(t *testing.T) { + a := NewCarbon(time.Now()) + b := NewCarbon(time.Now().Add(time.Hour * 10)) + + gotTime, err := a.DiffForHumans(b, false, false, false) + + assert.Nil(t, err) + assert.Equal(t, "10 hours before", gotTime) +} + func TestDiffForHumansAbsoluteDays(t *testing.T) { gotTime, err := Now().DiffForHumans(Now().SubDays(2), true, true, false) assert.Nil(t, err)