diff --git a/magefile.go b/magefile.go index 7c465d3cf..e2cbbe07f 100644 --- a/magefile.go +++ b/magefile.go @@ -25,7 +25,6 @@ import ( "context" "crypto/sha256" "fmt" - "github.com/iancoleman/strcase" "io" "os" "os/exec" @@ -34,6 +33,8 @@ import ( "strings" "time" + "github.com/iancoleman/strcase" + "github.com/magefile/mage/mg" "golang.org/x/sync/errgroup" "gopkg.in/yaml.v3" diff --git a/pkg/modules/auth/openid/openid_test.go b/pkg/modules/auth/openid/openid_test.go index bff4d149f..ea9b6fa22 100644 --- a/pkg/modules/auth/openid/openid_test.go +++ b/pkg/modules/auth/openid/openid_test.go @@ -112,16 +112,16 @@ func TestGetOrCreateUser(t *testing.T) { } u, err := getOrCreateUser(s, cl, "https://some.service.com", "12345") - assert.NoError(t, err) + require.NoError(t, err) teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) for _, err := range errs { - assert.NoError(t, err) + require.NoError(t, err) } - assert.NoError(t, err) + require.NoError(t, err) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) - 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, @@ -150,12 +150,12 @@ func TestGetOrCreateUser(t *testing.T) { u := &user.User{ID: 10} teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) for _, err := range errs { - assert.NoError(t, err) + require.NoError(t, err) } oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) - assert.NoError(t, err) + require.NoError(t, err) err = s.Commit() - assert.NoError(t, err) + require.NoError(t, err) db.AssertExists(t, "team_members", map[string]interface{}{ "team_id": oidcTeams, @@ -176,27 +176,27 @@ func TestGetOrCreateUser(t *testing.T) { teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) if len(errs) > 0 { for _, err := range errs { - assert.NoError(t, err) + require.NoError(t, err) } } oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID) - assert.NoError(t, err) + require.NoError(t, err) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) - assert.NoError(t, err) + require.NoError(t, err) teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams) - assert.NoError(t, err) + require.NoError(t, err) err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave) - assert.NoError(t, err) + require.NoError(t, err) errs = RemoveEmptySSOTeams(s, teamIDsToLeave) for _, err = range errs { - assert.NoError(t, err) + require.NoError(t, err) } errs = RemoveEmptySSOTeams(s, teamIDsToLeave) for _, err = range errs { - assert.NoError(t, err) + require.NoError(t, err) } err = s.Commit() - assert.NoError(t, err) + require.NoError(t, err) db.AssertMissing(t, "team_members", map[string]interface{}{ "team_id": oidcTeams, @@ -217,23 +217,23 @@ func TestGetOrCreateUser(t *testing.T) { teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) if len(errs) > 0 { for _, err := range errs { - assert.NoError(t, err) + require.NoError(t, err) } } oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID) - assert.NoError(t, err) + require.NoError(t, err) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) - assert.NoError(t, err) + require.NoError(t, err) teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams) - assert.NoError(t, err) + require.NoError(t, err) err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave) - assert.NoError(t, err) + require.NoError(t, err) errs = RemoveEmptySSOTeams(s, teamIDsToLeave) for _, err := range errs { - assert.NoError(t, err) + require.NoError(t, err) } err = s.Commit() - assert.NoError(t, err) + require.NoError(t, err) db.AssertMissing(t, "teams", map[string]interface{}{ "id": oidcTeams, })