Skip to content

Commit

Permalink
refactoring nits (#18188)
Browse files Browse the repository at this point in the history 
* no octal for time values

* rm artifact from refactoring

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
  • Loading branch information
@6543 @lunny
6543 and lunny authored Jan 5, 2022
1 parent 6da078d commit 0572c78
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 21 deletions.
1 change: 0 additions & 1 deletion routers/web/web.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ func RegisterRoutes(m *web.Route) {
ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})

//bindIgnErr := binding.BindIgnErr
bindIgnErr := web.Bind
validation.AddBindingRules()

Expand Down
4 changes: 2 additions & 2 deletions services/mailer/mailer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import (
)

func TestGenerateMessageID(t *testing.T) {
var mailService = setting.Mailer{
mailService := setting.Mailer{
From: "test@gitea.com",
}

setting.MailService = &mailService
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.Date = date
gm := m.ToMessage()
Expand Down
18 changes: 9 additions & 9 deletions services/migrations/github_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

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")
err := downloader.RefreshRate()
assert.NoError(t, err)
Expand Down Expand Up @@ -364,7 +364,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 165205,
ReviewerName: "lafriks",
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,
},
}, reviews)
Expand All @@ -378,7 +378,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 81045,
ReviewerName: "lunny",
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,
Comments: []*base.ReviewComment{
{
Expand All @@ -389,8 +389,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
Position: 3,
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
PosterID: 81045,
CreatedAt: time.Date(2020, 01, 04, 05, 33, 06, 0, time.UTC),
UpdatedAt: time.Date(2020, 01, 04, 05, 33, 18, 0, time.UTC),
CreatedAt: time.Date(2020, 1, 4, 5, 33, 6, 0, time.UTC),
UpdatedAt: time.Date(2020, 1, 4, 5, 33, 18, 0, time.UTC),
},
},
},
Expand All @@ -400,7 +400,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 81045,
ReviewerName: "lunny",
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,
Content: "Don't add more reviews",
},
Expand All @@ -410,7 +410,7 @@ func TestGitHubDownloadRepo(t *testing.T) {
ReviewerID: 81045,
ReviewerName: "lunny",
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,
Comments: []*base.ReviewComment{
{
Expand All @@ -421,8 +421,8 @@ func TestGitHubDownloadRepo(t *testing.T) {
Position: 4,
CommitID: "2be9101c543658591222acbee3eb799edfc3853d",
PosterID: 81045,
CreatedAt: time.Date(2020, 01, 04, 11, 21, 41, 0, time.UTC),
UpdatedAt: 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, 1, 4, 11, 21, 41, 0, time.UTC),
},
},
},
Expand Down
12 changes: 7 additions & 5 deletions services/migrations/gitlab_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ func TestGitlabDownloadRepo(t *testing.T) {
UserID: 1241334,
UserName: "lafriks",
Content: "open_mouth",
}},
},
},
Closed: timePtr(time.Date(2019, 11, 28, 8, 46, 23, 275000000, time.UTC)),
},
{
Expand Down Expand Up @@ -204,7 +205,8 @@ func TestGitlabDownloadRepo(t *testing.T) {
UserID: 1241334,
UserName: "lafriks",
Content: "hearts",
}},
},
},
Closed: timePtr(time.Date(2019, 11, 28, 8, 45, 44, 959000000, time.UTC)),
},
}, issues)
Expand Down Expand Up @@ -310,13 +312,13 @@ func TestGitlabDownloadRepo(t *testing.T) {
{
ReviewerID: 4102996,
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",
},
{
ReviewerID: 527793,
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",
},
}, rvs)
Expand All @@ -327,7 +329,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
{
ReviewerID: 4575606,
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",
},
}, rvs)
Expand Down
8 changes: 4 additions & 4 deletions services/migrations/gogs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ func TestGogsDownloadRepo(t *testing.T) {
Content: "test",
Milestone: "",
State: "open",
Created: time.Date(2019, 06, 11, 8, 16, 44, 0, time.UTC),
Updated: time.Date(2019, 10, 26, 11, 07, 2, 0, time.UTC),
Created: time.Date(2019, 6, 11, 8, 16, 44, 0, time.UTC),
Updated: time.Date(2019, 10, 26, 11, 7, 2, 0, time.UTC),
Labels: []*base.Label{
{
Name: "bug",
Expand All @@ -121,8 +121,8 @@ func TestGogsDownloadRepo(t *testing.T) {
PosterID: 5331,
PosterName: "lunny",
PosterEmail: "xiaolunwen@gmail.com",
Created: time.Date(2019, 06, 11, 8, 19, 50, 0, time.UTC),
Updated: 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, 6, 11, 8, 19, 50, 0, time.UTC),
Content: "1111",
},
{
Expand Down

0 comments on commit 0572c78

Please sign in to comment.