git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

refactoring nits (#18188)

Browse source 
* no octal for time values

* rm artifact from refactoring

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
6543 2022-01-05 07:27:53 +01:00 • committed by GitHub
commit 0572c78938
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
routers/web/web.go
View file

@ -189,7 +189,6 @@ func RegisterRoutes(m *web.Route) {
ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true}) ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true}) reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})
//bindIgnErr := binding.BindIgnErr
bindIgnErr := web.Bind bindIgnErr := web.Bind
validation.AddBindingRules() validation.AddBindingRules()

4
services/mailer/mailer_test.go
View file

@ -14,14 +14,14 @@ import (
) )
func TestGenerateMessageID(t *testing.T) { func TestGenerateMessageID(t *testing.T) {
var mailService = setting.Mailer{ mailService := setting.Mailer{
From: "test@gitea.com", From: "test@gitea.com",
} }
setting.MailService = &mailService setting.MailService = &mailService
setting.Domain = "localhost" setting.Domain = "localhost"
date := time.Date(2000, 01, 02, 03, 04, 05, 06, time.UTC) date := time.Date(2000, 1, 2, 3, 4, 5, 6, time.UTC)
m := NewMessageFrom(nil, "display-name", "from-address", "subject", "body") m := NewMessageFrom(nil, "display-name", "from-address", "subject", "body")
m.Date = date m.Date = date
gm := m.ToMessage() gm := m.ToMessage()

18
services/migrations/github_test.go
View file

@ -17,7 +17,7 @@ import (
) )
func TestGitHubDownloadRepo(t *testing.T) { func TestGitHubDownloadRepo(t *testing.T) {
GithubLimitRateRemaining = 3 //Wait at 3 remaining since we could have 3 CI in // GithubLimitRateRemaining = 3 // Wait at 3 remaining since we could have 3 CI in //
downloader := NewGithubDownloaderV3(context.Background(), "https://github.com", "", "", os.Getenv("GITHUB_READ_TOKEN"), "go-gitea", "test_repo") downloader := NewGithubDownloaderV3(context.Background(), "https://github.com", "", "", os.Getenv("GITHUB_READ_TOKEN"), "go-gitea", "test_repo")
err := downloader.RefreshRate() err := downloader.RefreshRate()
assert.NoError(t, err) assert.NoError(t, err)
@ -364,7 +364,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 165205, ReviewerID: 165205,
ReviewerName: "lafriks", ReviewerName: "lafriks",
CommitID: "076160cf0b039f13e5eff19619932d181269414b", CommitID: "076160cf0b039f13e5eff19619932d181269414b",
CreatedAt: time.Date(2019, 11, 12, 21, 38, 00, 0, time.UTC), CreatedAt: time.Date(2019, 11, 12, 21, 38, 0, 0, time.UTC),
State: base.ReviewStateApproved, State: base.ReviewStateApproved,
}, },
}, reviews) }, reviews)
@ -378,7 +378,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 81045, ReviewerID: 81045,
ReviewerName: "lunny", ReviewerName: "lunny",
CommitID: "2be9101c543658591222acbee3eb799edfc3853d", CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
CreatedAt: time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC), CreatedAt: time.Date(2020, 1, 4, 5, 33, 18, 0, time.UTC),
State: base.ReviewStateApproved, State: base.ReviewStateApproved,
Comments: []*base.ReviewComment{ Comments: []*base.ReviewComment{
{ {
@ -389,8 +389,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
Position: 3, Position: 3,
CommitID: "2be9101c543658591222acbee3eb799edfc3853d", CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
PosterID: 81045, PosterID: 81045,
CreatedAt: time.Date(2020, 01, 04, 05, 33, 06, 0, time.UTC), CreatedAt: time.Date(2020, 1, 4, 5, 33, 6, 0, time.UTC),
UpdatedAt: time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC), UpdatedAt: time.Date(2020, 1, 4, 5, 33, 18, 0, time.UTC),
}, },
}, },
}, },
@ -400,7 +400,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 81045, ReviewerID: 81045,
ReviewerName: "lunny", ReviewerName: "lunny",
CommitID: "2be9101c543658591222acbee3eb799edfc3853d", CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
CreatedAt: time.Date(2020, 01, 04, 06, 07, 06, 0, time.UTC), CreatedAt: time.Date(2020, 1, 4, 6, 7, 6, 0, time.UTC),
State: base.ReviewStateChangesRequested, State: base.ReviewStateChangesRequested,
Content: "Don't add more reviews", Content: "Don't add more reviews",
}, },
@ -410,7 +410,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 81045, ReviewerID: 81045,
ReviewerName: "lunny", ReviewerName: "lunny",
CommitID: "2be9101c543658591222acbee3eb799edfc3853d", CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
CreatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC), CreatedAt: time.Date(2020, 1, 4, 11, 21, 41, 0, time.UTC),
State: base.ReviewStateCommented, State: base.ReviewStateCommented,
Comments: []*base.ReviewComment{ Comments: []*base.ReviewComment{
{ {
@ -421,8 +421,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
Position: 4, Position: 4,
CommitID: "2be9101c543658591222acbee3eb799edfc3853d", CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
PosterID: 81045, PosterID: 81045,
CreatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC), CreatedAt: time.Date(2020, 1, 4, 11, 21, 41, 0, time.UTC),
UpdatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC), UpdatedAt: time.Date(2020, 1, 4, 11, 21, 41, 0, time.UTC),
}, },
}, },
}, },

12
services/migrations/gitlab_test.go
View file

@ -156,7 +156,8 @@ func TestGitlabDownloadRepo(t *testing.T) {
UserID: 1241334, UserID: 1241334,
UserName: "lafriks", UserName: "lafriks",
Content: "open_mouth", Content: "open_mouth",
}}, },
},
Closed: timePtr(time.Date(2019, 11, 28, 8, 46, 23, 275000000, time.UTC)), Closed: timePtr(time.Date(2019, 11, 28, 8, 46, 23, 275000000, time.UTC)),
}, },
{ {
@ -204,7 +205,8 @@ func TestGitlabDownloadRepo(t *testing.T) {
UserID: 1241334, UserID: 1241334,
UserName: "lafriks", UserName: "lafriks",
Content: "hearts", Content: "hearts",
}}, },
},
Closed: timePtr(time.Date(2019, 11, 28, 8, 45, 44, 959000000, time.UTC)), Closed: timePtr(time.Date(2019, 11, 28, 8, 45, 44, 959000000, time.UTC)),
}, },
}, issues) }, issues)
@ -310,13 +312,13 @@ func TestGitlabDownloadRepo(t *testing.T) {
{ {
ReviewerID: 4102996, ReviewerID: 4102996,
ReviewerName: "zeripath", ReviewerName: "zeripath",
CreatedAt: time.Date(2019, 11, 28, 16, 02, 8, 377000000, time.UTC), CreatedAt: time.Date(2019, 11, 28, 16, 2, 8, 377000000, time.UTC),
State: "APPROVED", State: "APPROVED",
}, },
{ {
ReviewerID: 527793, ReviewerID: 527793,
ReviewerName: "axifive", ReviewerName: "axifive",
CreatedAt: time.Date(2019, 11, 28, 16, 02, 8, 377000000, time.UTC), CreatedAt: time.Date(2019, 11, 28, 16, 2, 8, 377000000, time.UTC),
State: "APPROVED", State: "APPROVED",
}, },
}, rvs) }, rvs)
@ -327,7 +329,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
{ {
ReviewerID: 4575606, ReviewerID: 4575606,
ReviewerName: "real6543", ReviewerName: "real6543",
CreatedAt: time.Date(2020, 04, 19, 19, 24, 21, 108000000, time.UTC), CreatedAt: time.Date(2020, 4, 19, 19, 24, 21, 108000000, time.UTC),
State: "APPROVED", State: "APPROVED",
}, },
}, rvs) }, rvs)

8
services/migrations/gogs_test.go
View file

@ -99,8 +99,8 @@ func TestGogsDownloadRepo(t *testing.T) {
Content: "test", Content: "test",
Milestone: "", Milestone: "",
State: "open", State: "open",
Created: time.Date(2019, 06, 11, 8, 16, 44, 0, time.UTC), Created: time.Date(2019, 6, 11, 8, 16, 44, 0, time.UTC),
Updated: time.Date(2019, 10, 26, 11, 07, 2, 0, time.UTC), Updated: time.Date(2019, 10, 26, 11, 7, 2, 0, time.UTC),
Labels: []*base.Label{ Labels: []*base.Label{
{ {
Name: "bug", Name: "bug",
@ -121,8 +121,8 @@ func TestGogsDownloadRepo(t *testing.T) {
PosterID: 5331, PosterID: 5331,
PosterName: "lunny", PosterName: "lunny",
PosterEmail: "xiaolunwen@gmail.com", PosterEmail: "xiaolunwen@gmail.com",
Created: time.Date(2019, 06, 11, 8, 19, 50, 0, time.UTC), Created: time.Date(2019, 6, 11, 8, 19, 50, 0, time.UTC),
Updated: time.Date(2019, 06, 11, 8, 19, 50, 0, time.UTC), Updated: time.Date(2019, 6, 11, 8, 19, 50, 0, time.UTC),
Content: "1111", Content: "1111",
}, },
{ {