From 609c91665e5e4d6da50af0b2168d6cb46f9d6273 Mon Sep 17 00:00:00 2001 From: René Schaar Date: Tue, 15 Feb 2022 17:50:10 +0100 Subject: Fix display time of milestones (#18753) * Fix display time of milestones * Move the SecToTime function From the models/issue_stopwatch.go file to the modules/util package * Rename the sec_to_time file * Updated formatting * Include copyright notice in sec_to_time.go * Apply PR review suggestions - Update copyright notice dates to 2022 - Change `1 day 3h 5min 7s` to `1d 3h 5m 7s` * Rename hrs var and combine conditions * Update unit tests to match new time pattern Changed `1min` to `1m` Co-authored-by: Lunny Xiao --- modules/util/sec_to_time_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/util/sec_to_time_test.go (limited to 'modules/util/sec_to_time_test.go') diff --git a/modules/util/sec_to_time_test.go b/modules/util/sec_to_time_test.go new file mode 100644 index 0000000000..915dcbf727 --- /dev/null +++ b/modules/util/sec_to_time_test.go @@ -0,0 +1,20 @@ +// Copyright 2022 Gitea. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package util + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestSecToTime(t *testing.T) { + assert.Equal(t, SecToTime(10), "10s") + assert.Equal(t, SecToTime(100), "1m 40s") + assert.Equal(t, SecToTime(1000), "16m 40s") + assert.Equal(t, SecToTime(10000), "2h 46m 40s") + assert.Equal(t, SecToTime(100000), "1d 3h 46m 40s") + assert.Equal(t, SecToTime(1000000), "11d 13h 46m 40s") +} -- cgit v1.2.3