Skip to content

Commit 0572c78

Browse files
6543lunny
6543
and
lunny
authored
refactoring nits (#18188)
* no octal for time values * rm artifact from refactoring Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent 6da078d commit 0572c78

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

Diff for: ‎routers/web/web.go

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ func RegisterRoutes(m *web.Route) {
189189
ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
190190
reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})
191191

192-
//bindIgnErr := binding.BindIgnErr
193192
bindIgnErr := web.Bind
194193
validation.AddBindingRules()
195194

Diff for: ‎services/mailer/mailer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import (
1414
)
1515

1616
func TestGenerateMessageID(t *testing.T) {
17-
var mailService = setting.Mailer{
17+
mailService := setting.Mailer{
1818
From: "test@gitea.com",
1919
}
2020

2121
setting.MailService = &mailService
2222
setting.Domain = "localhost"
2323

24-
date := time.Date(2000, 01, 02, 03, 04, 05, 06, time.UTC)
24+
date := time.Date(2000, 1, 2, 3, 4, 5, 6, time.UTC)
2525
m := NewMessageFrom(nil, "display-name", "from-address", "subject", "body")
2626
m.Date = date
2727
gm := m.ToMessage()

Diff for: ‎services/migrations/github_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
func TestGitHubDownloadRepo(t *testing.T) {
20-
GithubLimitRateRemaining = 3 //Wait at 3 remaining since we could have 3 CI in //
20+
GithubLimitRateRemaining = 3 // Wait at 3 remaining since we could have 3 CI in //
2121
downloader := NewGithubDownloaderV3(context.Background(), "https://github.com", "", "", os.Getenv("GITHUB_READ_TOKEN"), "go-gitea", "test_repo")
2222
err := downloader.RefreshRate()
2323
assert.NoError(t, err)
@@ -364,7 +364,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
364364
ReviewerID: 165205,
365365
ReviewerName: "lafriks",
366366
CommitID: "076160cf0b039f13e5eff19619932d181269414b",
367-
CreatedAt: time.Date(2019, 11, 12, 21, 38, 00, 0, time.UTC),
367+
CreatedAt: time.Date(2019, 11, 12, 21, 38, 0, 0, time.UTC),
368368
State: base.ReviewStateApproved,
369369
},
370370
}, reviews)
@@ -378,7 +378,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
378378
ReviewerID: 81045,
379379
ReviewerName: "lunny",
380380
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
381-
CreatedAt: time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC),
381+
CreatedAt: time.Date(2020, 1, 4, 5, 33, 18, 0, time.UTC),
382382
State: base.ReviewStateApproved,
383383
Comments: []*base.ReviewComment{
384384
{
@@ -389,8 +389,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
389389
Position: 3,
390390
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
391391
PosterID: 81045,
392-
CreatedAt: time.Date(2020, 01, 04, 05, 33, 06, 0, time.UTC),
393-
UpdatedAt: time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC),
392+
CreatedAt: time.Date(2020, 1, 4, 5, 33, 6, 0, time.UTC),
393+
UpdatedAt: time.Date(2020, 1, 4, 5, 33, 18, 0, time.UTC),
394394
},
395395
},
396396
},
@@ -400,7 +400,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
400400
ReviewerID: 81045,
401401
ReviewerName: "lunny",
402402
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
403-
CreatedAt: time.Date(2020, 01, 04, 06, 07, 06, 0, time.UTC),
403+
CreatedAt: time.Date(2020, 1, 4, 6, 7, 6, 0, time.UTC),
404404
State: base.ReviewStateChangesRequested,
405405
Content: "Don't add more reviews",
406406
},
@@ -410,7 +410,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
410410
ReviewerID: 81045,
411411
ReviewerName: "lunny",
412412
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
413-
CreatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC),
413+
CreatedAt: time.Date(2020, 1, 4, 11, 21, 41, 0, time.UTC),
414414
State: base.ReviewStateCommented,
415415
Comments: []*base.ReviewComment{
416416
{
@@ -421,8 +421,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
421421
Position: 4,
422422
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
423423
PosterID: 81045,
424-
CreatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC),
425-
UpdatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC),
424+
CreatedAt: time.Date(2020, 1, 4, 11, 21, 41, 0, time.UTC),
425+
UpdatedAt: time.Date(2020, 1, 4, 11, 21, 41, 0, time.UTC),
426426
},
427427
},
428428
},

Diff for: ‎services/migrations/gitlab_test.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ func TestGitlabDownloadRepo(t *testing.T) {
156156
UserID: 1241334,
157157
UserName: "lafriks",
158158
Content: "open_mouth",
159-
}},
159+
},
160+
},
160161
Closed: timePtr(time.Date(2019, 11, 28, 8, 46, 23, 275000000, time.UTC)),
161162
},
162163
{
@@ -204,7 +205,8 @@ func TestGitlabDownloadRepo(t *testing.T) {
204205
UserID: 1241334,
205206
UserName: "lafriks",
206207
Content: "hearts",
207-
}},
208+
},
209+
},
208210
Closed: timePtr(time.Date(2019, 11, 28, 8, 45, 44, 959000000, time.UTC)),
209211
},
210212
}, issues)
@@ -310,13 +312,13 @@ func TestGitlabDownloadRepo(t *testing.T) {
310312
{
311313
ReviewerID: 4102996,
312314
ReviewerName: "zeripath",
313-
CreatedAt: time.Date(2019, 11, 28, 16, 02, 8, 377000000, time.UTC),
315+
CreatedAt: time.Date(2019, 11, 28, 16, 2, 8, 377000000, time.UTC),
314316
State: "APPROVED",
315317
},
316318
{
317319
ReviewerID: 527793,
318320
ReviewerName: "axifive",
319-
CreatedAt: time.Date(2019, 11, 28, 16, 02, 8, 377000000, time.UTC),
321+
CreatedAt: time.Date(2019, 11, 28, 16, 2, 8, 377000000, time.UTC),
320322
State: "APPROVED",
321323
},
322324
}, rvs)
@@ -327,7 +329,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
327329
{
328330
ReviewerID: 4575606,
329331
ReviewerName: "real6543",
330-
CreatedAt: time.Date(2020, 04, 19, 19, 24, 21, 108000000, time.UTC),
332+
CreatedAt: time.Date(2020, 4, 19, 19, 24, 21, 108000000, time.UTC),
331333
State: "APPROVED",
332334
},
333335
}, rvs)

Diff for: ‎services/migrations/gogs_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ func TestGogsDownloadRepo(t *testing.T) {
9999
Content: "test",
100100
Milestone: "",
101101
State: "open",
102-
Created: time.Date(2019, 06, 11, 8, 16, 44, 0, time.UTC),
103-
Updated: time.Date(2019, 10, 26, 11, 07, 2, 0, time.UTC),
102+
Created: time.Date(2019, 6, 11, 8, 16, 44, 0, time.UTC),
103+
Updated: time.Date(2019, 10, 26, 11, 7, 2, 0, time.UTC),
104104
Labels: []*base.Label{
105105
{
106106
Name: "bug",
@@ -121,8 +121,8 @@ func TestGogsDownloadRepo(t *testing.T) {
121121
PosterID: 5331,
122122
PosterName: "lunny",
123123
PosterEmail: "xiaolunwen@gmail.com",
124-
Created: time.Date(2019, 06, 11, 8, 19, 50, 0, time.UTC),
125-
Updated: time.Date(2019, 06, 11, 8, 19, 50, 0, time.UTC),
124+
Created: time.Date(2019, 6, 11, 8, 19, 50, 0, time.UTC),
125+
Updated: time.Date(2019, 6, 11, 8, 19, 50, 0, time.UTC),
126126
Content: "1111",
127127
},
128128
{

0 commit comments

Comments
 (0)