Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/service/ref/util_test.go')
-rw-r--r--internal/service/ref/util_test.go56
1 files changed, 32 insertions, 24 deletions
diff --git a/internal/service/ref/util_test.go b/internal/service/ref/util_test.go
index 7a9d40d29..ac09bb8cc 100644
--- a/internal/service/ref/util_test.go
+++ b/internal/service/ref/util_test.go
@@ -21,14 +21,16 @@ func TestBuildLocalBranch(t *testing.T) {
Subject: []byte("Merge branch 'branch-merged' into 'master'"),
Body: []byte("Merge branch 'branch-merged' into 'master'\r\n\r\nadds bar folder and branch-test text file to check Repository merged_to_root_ref method\r\n\r\n\r\n\r\nSee merge request !12"),
Author: &gitalypb.CommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
Committer: &gitalypb.CommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
ParentIds: []string{
"1b12f15a11fc6e62177bef08f47bc7b5ce50b141",
@@ -41,14 +43,16 @@ func TestBuildLocalBranch(t *testing.T) {
CommitId: "b83d6e391c22777fca1ed3012fce84f633d7fed0",
CommitSubject: []byte("Merge branch 'branch-merged' into 'master'"),
CommitAuthor: &gitalypb.FindLocalBranchCommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
CommitCommitter: &gitalypb.FindLocalBranchCommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
},
},
@@ -59,9 +63,10 @@ func TestBuildLocalBranch(t *testing.T) {
Subject: []byte("Merge branch 'branch-merged' into 'master'"),
Body: []byte("Merge branch 'branch-merged' into 'master'\r\n\r\nadds bar folder and branch-test text file to check Repository merged_to_root_ref method\r\n\r\n\r\n\r\nSee merge request !12"),
Committer: &gitalypb.CommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
ParentIds: []string{
"1b12f15a11fc6e62177bef08f47bc7b5ce50b141",
@@ -75,9 +80,10 @@ func TestBuildLocalBranch(t *testing.T) {
CommitSubject: []byte("Merge branch 'branch-merged' into 'master'"),
CommitAuthor: nil,
CommitCommitter: &gitalypb.FindLocalBranchCommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
},
},
@@ -88,9 +94,10 @@ func TestBuildLocalBranch(t *testing.T) {
Subject: []byte("Merge branch 'branch-merged' into 'master'"),
Body: []byte("Merge branch 'branch-merged' into 'master'\r\n\r\nadds bar folder and branch-test text file to check Repository merged_to_root_ref method\r\n\r\n\r\n\r\nSee merge request !12"),
Author: &gitalypb.CommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
ParentIds: []string{
"1b12f15a11fc6e62177bef08f47bc7b5ce50b141",
@@ -103,9 +110,10 @@ func TestBuildLocalBranch(t *testing.T) {
CommitId: "b83d6e391c22777fca1ed3012fce84f633d7fed0",
CommitSubject: []byte("Merge branch 'branch-merged' into 'master'"),
CommitAuthor: &gitalypb.FindLocalBranchCommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0200"),
},
CommitCommitter: nil,
},