ami/tl-vikunja
1
0
Fork 0
Code Activity

chore(deps): update golangci-lint rules

Browse Source
This commit is contained in:
kolaente
2023-12-19 13:34:31 +01:00
parent 48a173a563
commit c05f51b923
60 changed files with 999 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/modules/auth/openid/openid_test.go
View File

@ -20,7 +20,9 @@ import (
"testing"
"code.vikunja.io/api/pkg/db"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestGetOrCreateUser(t *testing.T) {
@ -34,9 +36,9 @@ func TestGetOrCreateUser(t *testing.T) {
PreferredUsername: "someUserWhoDoesNotExistYet",
}
u, err := getOrCreateUser(s, cl, "https://some.issuer", "12345")
assert.NoError(t, err)
require.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
require.NoError(t, err)
db.AssertExists(t, "users", map[string]interface{}{
"id": u.ID,
@ -54,10 +56,10 @@ func TestGetOrCreateUser(t *testing.T) {
PreferredUsername: "",
}
u, err := getOrCreateUser(s, cl, "https://some.issuer", "12345")
assert.NoError(t, err)
require.NoError(t, err)
assert.NotEmpty(t, u.Username)
err = s.Commit()
assert.NoError(t, err)
require.NoError(t, err)
db.AssertExists(t, "users", map[string]interface{}{
"id": u.ID,
@ -73,7 +75,7 @@ func TestGetOrCreateUser(t *testing.T) {
Email: "",
}
_, err := getOrCreateUser(s, cl, "https://some.issuer", "12345")
assert.Error(t, err)
require.Error(t, err)
})
t.Run("existing user, different email address", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
@ -84,9 +86,9 @@ func TestGetOrCreateUser(t *testing.T) {
Email: "other-email-address@some.service.com",
}
u, err := getOrCreateUser(s, cl, "https://some.service.com", "12345")
assert.NoError(t, err)
require.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
require.NoError(t, err)
db.AssertExists(t, "users", map[string]interface{}{
"id": u.ID,

4
pkg/modules/migration/create_from_structure_test.go
View File

@ -23,7 +23,9 @@ import (
"code.vikunja.io/api/pkg/files"
"code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestInsertFromStructure(t *testing.T) {
@ -135,7 +137,7 @@ func TestInsertFromStructure(t *testing.T) {
},
}
err := InsertFromStructure(testStructure, u)
assert.NoError(t, err)
require.NoError(t, err)
db.AssertExists(t, "projects", map[string]interface{}{
"title": testStructure[1].Title,
"description": testStructure[1].Description,

6
pkg/modules/migration/microsoft-todo/microsoft_todo_test.go
View File

@ -21,8 +21,10 @@ import (
"time"
"code.vikunja.io/api/pkg/models"
"github.com/d4l3k/messagediff"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestConverting(t *testing.T) {
@ -33,7 +35,7 @@ func TestConverting(t *testing.T) {
}
testtimeTime, err := time.Parse(time.RFC3339Nano, "2020-12-18T03:00:00.4770000Z")
assert.NoError(t, err)
require.NoError(t, err)
microsoftTodoData := []*project{
{
@ -188,7 +190,7 @@ func TestConverting(t *testing.T) {
}
hierachie, err := convertMicrosoftTodoData(microsoftTodoData)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, hierachie)
if diff, equal := messagediff.PrettyDiff(hierachie, expectedHierachie); !equal {
t.Errorf("converted microsoft todo data = %v, want %v, diff: %v", hierachie, expectedHierachie, diff)

18
pkg/modules/migration/ticktick/ticktick_test.go
View File

@ -99,41 +99,41 @@ func TestConvertTicktickTasksToVikunja(t *testing.T) {
assert.Equal(t, vikunjaTasks[1].Tasks[0].StartDate, tickTickTasks[0].StartDate.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[0].EndDate, tickTickTasks[0].DueDate.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[0].DueDate, tickTickTasks[0].DueDate.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[0].Labels, []*models.Label{
assert.Equal(t, []*models.Label{
{Title: "label1"},
{Title: "label2"},
})
}, vikunjaTasks[1].Tasks[0].Labels)
assert.Equal(t, vikunjaTasks[1].Tasks[0].Reminders[0].RelativeTo, models.ReminderRelation("due_date"))
assert.Equal(t, vikunjaTasks[1].Tasks[0].Reminders[0].RelativePeriod, int64(-24*3600))
assert.Equal(t, vikunjaTasks[1].Tasks[0].Position, tickTickTasks[0].Order)
assert.Equal(t, vikunjaTasks[1].Tasks[0].Done, false)
assert.False(t, vikunjaTasks[1].Tasks[0].Done)
assert.Equal(t, vikunjaTasks[1].Tasks[1].Title, tickTickTasks[1].Title)
assert.Equal(t, vikunjaTasks[1].Tasks[1].Position, tickTickTasks[1].Order)
assert.Equal(t, vikunjaTasks[1].Tasks[1].Done, true)
assert.True(t, vikunjaTasks[1].Tasks[1].Done)
assert.Equal(t, vikunjaTasks[1].Tasks[1].DoneAt, tickTickTasks[1].CompletedTime.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[1].RelatedTasks, models.RelatedTaskMap{
assert.Equal(t, models.RelatedTaskMap{
models.RelationKindParenttask: []*models.Task{
{
ID: tickTickTasks[1].ParentID,
},
},
})
}, vikunjaTasks[1].Tasks[1].RelatedTasks)
assert.Equal(t, vikunjaTasks[1].Tasks[2].Title, tickTickTasks[2].Title)
assert.Equal(t, vikunjaTasks[1].Tasks[2].Description, tickTickTasks[2].Content)
assert.Equal(t, vikunjaTasks[1].Tasks[2].StartDate, tickTickTasks[2].StartDate.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[2].EndDate, tickTickTasks[2].DueDate.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[2].DueDate, tickTickTasks[2].DueDate.Time)
assert.Equal(t, vikunjaTasks[1].Tasks[2].Labels, []*models.Label{
assert.Equal(t, []*models.Label{
{Title: "label1"},
{Title: "label2"},
{Title: "other label"},
})
}, vikunjaTasks[1].Tasks[2].Labels)
assert.Equal(t, vikunjaTasks[1].Tasks[2].Reminders[0].RelativeTo, models.ReminderRelation("due_date"))
assert.Equal(t, vikunjaTasks[1].Tasks[2].Reminders[0].RelativePeriod, int64(-24*3600))
assert.Equal(t, vikunjaTasks[1].Tasks[2].Position, tickTickTasks[2].Order)
assert.Equal(t, vikunjaTasks[1].Tasks[2].Done, false)
assert.False(t, vikunjaTasks[1].Tasks[2].Done)
assert.Len(t, vikunjaTasks[2].Tasks, 1)
assert.Equal(t, vikunjaTasks[2].Title, tickTickTasks[3].ProjectName)

16
pkg/modules/migration/todoist/todoist_test.go
View File

@ -24,7 +24,9 @@ import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/files"
"code.vikunja.io/api/pkg/models"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/d4l3k/messagediff.v1"
)
@ -33,21 +35,21 @@ func TestConvertTodoistToVikunja(t *testing.T) {
config.InitConfig()
time1, err := time.Parse(time.RFC3339Nano, "2014-09-26T08:25:05Z")
assert.NoError(t, err)
require.NoError(t, err)
time1 = time1.In(config.GetTimeZone())
time3, err := time.Parse(time.RFC3339Nano, "2014-10-21T08:25:05Z")
assert.NoError(t, err)
require.NoError(t, err)
time3 = time3.In(config.GetTimeZone())
dueTime, err := time.Parse(time.RFC3339Nano, "2020-05-31T23:59:00Z")
assert.NoError(t, err)
require.NoError(t, err)
dueTime = dueTime.In(config.GetTimeZone())
dueTimeWithTime, err := time.Parse(time.RFC3339Nano, "2021-01-31T19:00:00Z")
assert.NoError(t, err)
require.NoError(t, err)
dueTimeWithTime = dueTimeWithTime.In(config.GetTimeZone())
nilTime, err := time.Parse(time.RFC3339Nano, "0001-01-01T00:00:00Z")
assert.NoError(t, err)
require.NoError(t, err)
exampleFile, err := os.ReadFile(config.ServiceRootpath.GetString() + "/pkg/modules/migration/testimage.jpg")
assert.NoError(t, err)
require.NoError(t, err)
makeTestItem := func(id, projectId string, hasDueDate, hasLabels, done bool) *item {
item := &item{
@ -629,7 +631,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
doneItems := make(map[string]*doneItem)
hierachie, err := convertTodoistToVikunja(testSync, doneItems)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, hierachie)
if diff, equal := messagediff.PrettyDiff(hierachie, expectedHierachie); !equal {
t.Errorf("converted todoist data = %v, want %v, diff: %v", hierachie, expectedHierachie, diff)

8
pkg/modules/migration/trello/trello_test.go
View File

@ -25,9 +25,11 @@ import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/files"
"code.vikunja.io/api/pkg/models"
"github.com/adlio/trello"
"github.com/d4l3k/messagediff"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestConvertTrelloToVikunja(t *testing.T) {
@ -35,9 +37,9 @@ func TestConvertTrelloToVikunja(t *testing.T) {
config.InitConfig()
time1, err := time.Parse(time.RFC3339Nano, "2014-09-26T08:25:05Z")
assert.NoError(t, err)
require.NoError(t, err)
exampleFile, err := os.ReadFile(config.ServiceRootpath.GetString() + "/pkg/modules/migration/testimage.jpg")
assert.NoError(t, err)
require.NoError(t, err)
trelloData := []*trello.Board{
{
@ -365,7 +367,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
}
hierachie, err := convertTrelloDataToVikunja(trelloData, "")
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, hierachie)
if diff, equal := messagediff.PrettyDiff(hierachie, expectedHierachie); !equal {
t.Errorf("converted trello data = %v, want %v, diff: %v", hierachie, expectedHierachie, diff)

9
pkg/modules/migration/vikunja-file/vikunja_test.go
View File

@ -23,7 +23,8 @@ import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestVikunjaFileMigrator_Migrate(t *testing.T) {
@ -44,7 +45,7 @@ func TestVikunjaFileMigrator_Migrate(t *testing.T) {
}
err = m.Migrate(u, f, s.Size())
assert.NoError(t, err)
require.NoError(t, err)
db.AssertExists(t, "projects", map[string]interface{}{
"title": "test project",
"owner_id": u.ID,
@ -91,7 +92,7 @@ func TestVikunjaFileMigrator_Migrate(t *testing.T) {
}
err = m.Migrate(u, f, s.Size())
assert.Error(t, err)
assert.ErrorContainsf(t, err, "export was created with an older version", "Invalid error message")
require.Error(t, err)
require.ErrorContainsf(t, err, "export was created with an older version", "Invalid error message")
})
}