ami/tl-vikunja
1
0
Fork 0
Code Activity

fix(deps): update golangci

Browse Source 
(cherry picked from commit 8bfd0493b2690df65ae13cf2c2a59689555631b8)
This commit is contained in:
kolaente
2024-08-25 15:51:34 +02:00
parent 72db97203a
commit 7b275794dc
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/user.go
View File

@ -24,13 +24,13 @@ import (
"strings"
"time"
"github.com/asaskevich/govalidator"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/initialize"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/user"
"github.com/asaskevich/govalidator"
"github.com/olekukonko/tablewriter"
"github.com/spf13/cobra"
"golang.org/x/term"

16
pkg/db/test.go
View File

@ -94,16 +94,16 @@ func AssertExists(t *testing.T, table string, values map[string]interface{}, cus
} else {
exists, err = x.Table(table).Where(values).Get(&v)
}
require.NoError(t, err, fmt.Sprintf("Failed to assert entries exist in db, error was: %s", err))
require.NoError(t, err, "Failed to assert entries exist in db")
if !exists {
all := []map[string]interface{}{}
err = x.Table(table).Find(&all)
require.NoError(t, err, fmt.Sprintf("Failed to assert entries exist in db, error was: %s", err))
require.NoErrorf(t, err, "Failed to assert entries exist in db, error was: %s", err)
pretty, err := json.MarshalIndent(all, "", " ")
require.NoError(t, err, fmt.Sprintf("Failed to assert entries exist in db, error was: %s", err))
require.NoErrorf(t, err, "Failed to assert entries exist in db, error was: %s", err)
t.Errorf(fmt.Sprintf("Entries %v do not exist in table %s\n\nFound entries instead: %v", values, table, string(pretty)))
t.Errorf("Entries %v do not exist in table %s\n\nFound entries instead: %v", values, table, string(pretty))
}
}
@ -111,13 +111,13 @@ func AssertExists(t *testing.T, table string, values map[string]interface{}, cus
func AssertMissing(t *testing.T, table string, values map[string]interface{}) {
v := make(map[string]interface{})
exists, err := x.Table(table).Where(values).Exist(&v)
require.NoError(t, err, fmt.Sprintf("Failed to assert entries don't exist in db, error was: %s", err))
assert.False(t, exists, fmt.Sprintf("Entries %v exist in table %s", values, table))
require.NoErrorf(t, err, "Failed to assert entries don't exist in db, error was: %s", err)
assert.Falsef(t, exists, "Entries %v exist in table %s", values, table)
}
// AssertCount checks if a number of entries exists in the database
func AssertCount(t *testing.T, table string, where builder.Cond, count int64) {
dbCount, err := x.Table(table).Where(where).Count()
require.NoError(t, err, fmt.Sprintf("Failed to assert count in db, error was: %s", err))
assert.Equal(t, count, dbCount, fmt.Sprintf("Found %d entries instead of expected %d in table %s", dbCount, count, table))
require.NoErrorf(t, err, "Failed to assert count in db, error was: %s", err)
assert.Equalf(t, count, dbCount, "Found %d entries instead of expected %d in table %s", dbCount, count, table)
}

2
pkg/user/user_test.go
View File

@ -390,7 +390,7 @@ func TestListUsers(t *testing.T) {
all, err := ListUsers(s, "uSEr1", nil)
require.NoError(t, err)
assert.NotEmpty(t, len(all))
assert.NotEmpty(t, all)
assert.Equal(t, "user1", all[0].Username)
})
t.Run("all users", func(t *testing.T) {