diff options
author | Baodong <wwwicbd@gmail.com> | 2021-07-01 07:48:16 +0300 |
---|---|---|
committer | Baodong <wwwicbd@gmail.com> | 2021-07-01 08:47:02 +0300 |
commit | 78c38deaa1c6d43c02c3d5ada735fcfd1296f8db (patch) | |
tree | 708773345790f5a399d9dd640275f2a661b08306 /internal/gitaly/service/operations/submodules_test.go | |
parent | 567586cef0b8ea28c30052110919ac59ecb0e065 (diff) |
fix: Set operations timezone by User
Previously, the time of Web GUI Git operations is set by `time.Now()` or `ptypes.Timestamp`, and the time zone (system local or UTC) is not what we expected.
This commit corrects the timezone of the operation according to the User's time zone.
Changelog: fixed
Diffstat (limited to 'internal/gitaly/service/operations/submodules_test.go')
-rw-r--r-- | internal/gitaly/service/operations/submodules_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index d993b041e..49c2fe20e 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -83,9 +83,10 @@ func TestSuccessfulUserUpdateSubmoduleRequest(t *testing.T) { commit, err := repo.ReadCommit(ctx, git.Revision(response.BranchUpdate.CommitId)) require.NoError(t, err) - require.Equal(t, commit.Author.Email, gittest.TestUser.Email) - require.Equal(t, commit.Committer.Email, gittest.TestUser.Email) - require.Equal(t, commit.Subject, commitMessage) + require.Equal(t, gittest.TestUser.Email, commit.Author.Email) + require.Equal(t, gittest.TimezoneOffset, string(commit.Author.Timezone)) + require.Equal(t, gittest.TestUser.Email, commit.Committer.Email) + require.Equal(t, commitMessage, commit.Subject) entry := gittest.Exec(t, cfg, "-C", repoPath, "ls-tree", "-z", fmt.Sprintf("%s^{tree}:", response.BranchUpdate.CommitId), testCase.submodule) parser := lstree.NewParser(bytes.NewReader(entry)) @@ -120,7 +121,7 @@ func TestUserUpdateSubmoduleStableID(t *testing.T) { commit, err := repo.ReadCommit(ctx, git.Revision(response.BranchUpdate.CommitId)) require.NoError(t, err) require.Equal(t, &gitalypb.GitCommit{ - Id: "e7752dfc2105bc830f8fa59b19dd4f3e49c8c44e", + Id: "928a79b1c5bbe64759f540aad8b339d281719118", ParentIds: []string{ "1e292f8fedd741b75372e19097c76d327140c312", }, @@ -132,13 +133,13 @@ func TestUserUpdateSubmoduleStableID(t *testing.T) { Name: gittest.TestUser.Name, Email: gittest.TestUser.Email, Date: ×tamp.Timestamp{Seconds: 12345}, - Timezone: []byte("+0000"), + Timezone: []byte(gittest.TimezoneOffset), }, Committer: &gitalypb.CommitAuthor{ Name: gittest.TestUser.Name, Email: gittest.TestUser.Email, Date: ×tamp.Timestamp{Seconds: 12345}, - Timezone: []byte("+0000"), + Timezone: []byte(gittest.TimezoneOffset), }, }, commit) } |