Skip to content

Commit 519db1e

Browse files
authored
Merge pull request #34 from thaJeztah/remove_46_minutes_threshold
Revert 46 minute threshold
2 parents c5ddfca + 2d3bf93 commit 519db1e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

duration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func HumanDuration(d time.Duration) string {
1818
return fmt.Sprintf("%d seconds", seconds)
1919
} else if minutes := int(d.Minutes()); minutes == 1 {
2020
return "About a minute"
21-
} else if minutes < 46 {
21+
} else if minutes < 60 {
2222
return fmt.Sprintf("%d minutes", minutes)
2323
} else if hours := int(d.Hours() + 0.5); hours == 1 {
2424
return "About an hour"

duration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func TestHumanDuration(t *testing.T) {
5959
assertEquals(t, "35 minutes", HumanDuration(35*time.Minute+40*time.Second))
6060
assertEquals(t, "45 minutes", HumanDuration(45*time.Minute))
6161
assertEquals(t, "45 minutes", HumanDuration(45*time.Minute+40*time.Second))
62-
assertEquals(t, "About an hour", HumanDuration(46*time.Minute))
63-
assertEquals(t, "About an hour", HumanDuration(59*time.Minute))
62+
assertEquals(t, "46 minutes", HumanDuration(46*time.Minute))
63+
assertEquals(t, "59 minutes", HumanDuration(59*time.Minute))
6464
assertEquals(t, "About an hour", HumanDuration(1*time.Hour))
6565
assertEquals(t, "About an hour", HumanDuration(1*time.Hour+29*time.Minute))
6666
assertEquals(t, "2 hours", HumanDuration(1*time.Hour+31*time.Minute))

0 commit comments

Comments
 (0)