Skip to content

Commit

Permalink
Allow mocking timeutil (go-gitea#17354) (go-gitea#17356)
Browse files Browse the repository at this point in the history
Signed-off-by: jolheiser <john.olheiser@gmail.com>
  • Loading branch information
jolheiser authored Oct 18, 2021
1 parent c577019 commit eb748ff
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
7 changes: 7 additions & 0 deletions models/user_heatmap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ package models
import (
"fmt"
"testing"
"time"

"code.gitea.io/gitea/modules/timeutil"

jsoniter "github.com/json-iterator/go"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -37,6 +40,10 @@ func TestGetUserHeatmapDataByUser(t *testing.T) {
// Prepare
assert.NoError(t, PrepareTestDatabase())

// Mock time
timeutil.Set(time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC))
defer timeutil.Unset()

for i, tc := range testCases {
user := AssertExistsAndLoadBean(t, &User{ID: tc.userID}).(*User)

Expand Down
16 changes: 16 additions & 0 deletions modules/timeutil/timestamp.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,24 @@ import (
// TimeStamp defines a timestamp
type TimeStamp int64

// mock is NOT concurrency-safe!!
var mock time.Time

// Set sets the time to a mocked time.Time
func Set(now time.Time) {
mock = now
}

// Unset will unset the mocked time.Time
func Unset() {
mock = time.Time{}
}

// TimeStampNow returns now int64
func TimeStampNow() TimeStamp {
if !mock.IsZero() {
return TimeStamp(mock.Unix())
}
return TimeStamp(time.Now().Unix())
}

Expand Down

0 comments on commit eb748ff

Please sign in to comment.