viehlieb/api
1
0
Fork 1
forked from vikunja/vikunja
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed assert to require in openid test

Browse Source
This commit is contained in:
viehlieb 2024-02-23 14:21:40 +01:00
parent 03fd257138
commit 6962e819a5
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magefile.go
View File

@ -25,7 +25,6 @@ import (
"context" "context"
"crypto/sha256" "crypto/sha256"
"fmt" "fmt"
"github.com/iancoleman/strcase"
"io" "io"
"os" "os"
"os/exec" "os/exec"
@ -34,6 +33,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/iancoleman/strcase"
"github.com/magefile/mage/mg" "github.com/magefile/mage/mg"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

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

@ -112,16 +112,16 @@ func TestGetOrCreateUser(t *testing.T) {
} }
u, err := getOrCreateUser(s, cl, "https://some.service.com", "12345") u, err := getOrCreateUser(s, cl, "https://some.service.com", "12345")
assert.NoError(t, err) require.NoError(t, err)
teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil)
for _, err := range errs { 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) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData)
assert.NoError(t, err) require.NoError(t, err)
err = s.Commit() err = s.Commit()
assert.NoError(t, err) require.NoError(t, err)
db.AssertExists(t, "users", map[string]interface{}{ db.AssertExists(t, "users", map[string]interface{}{
"id": u.ID, "id": u.ID,
@ -150,12 +150,12 @@ func TestGetOrCreateUser(t *testing.T) {
u := &user.User{ID: 10} u := &user.User{ID: 10}
teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil)
for _, err := range errs { for _, err := range errs {
assert.NoError(t, err) require.NoError(t, err)
} }
oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData)
assert.NoError(t, err) require.NoError(t, err)
err = s.Commit() err = s.Commit()
assert.NoError(t, err) require.NoError(t, err)
db.AssertExists(t, "team_members", map[string]interface{}{ db.AssertExists(t, "team_members", map[string]interface{}{
"team_id": oidcTeams, "team_id": oidcTeams,
@ -176,27 +176,27 @@ func TestGetOrCreateUser(t *testing.T) {
teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil)
if len(errs) > 0 { if len(errs) > 0 {
for _, err := range errs { for _, err := range errs {
assert.NoError(t, err) require.NoError(t, err)
} }
} }
oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID) oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID)
assert.NoError(t, err) require.NoError(t, err)
oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData)
assert.NoError(t, err) require.NoError(t, err)
teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams) teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams)
assert.NoError(t, err) require.NoError(t, err)
err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave) err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave)
assert.NoError(t, err) require.NoError(t, err)
errs = RemoveEmptySSOTeams(s, teamIDsToLeave) errs = RemoveEmptySSOTeams(s, teamIDsToLeave)
for _, err = range errs { for _, err = range errs {
assert.NoError(t, err) require.NoError(t, err)
} }
errs = RemoveEmptySSOTeams(s, teamIDsToLeave) errs = RemoveEmptySSOTeams(s, teamIDsToLeave)
for _, err = range errs { for _, err = range errs {
assert.NoError(t, err) require.NoError(t, err)
} }
err = s.Commit() err = s.Commit()
assert.NoError(t, err) require.NoError(t, err)
db.AssertMissing(t, "team_members", map[string]interface{}{ db.AssertMissing(t, "team_members", map[string]interface{}{
"team_id": oidcTeams, "team_id": oidcTeams,
@ -217,23 +217,23 @@ func TestGetOrCreateUser(t *testing.T) {
teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil) teamData, errs := getTeamDataFromToken(cl.VikunjaGroups, nil)
if len(errs) > 0 { if len(errs) > 0 {
for _, err := range errs { for _, err := range errs {
assert.NoError(t, err) require.NoError(t, err)
} }
} }
oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID) oldOidcTeams, err := models.FindAllOidcTeamIDsForUser(s, u.ID)
assert.NoError(t, err) require.NoError(t, err)
oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData) oidcTeams, err := AssignOrCreateUserToTeams(s, u, teamData)
assert.NoError(t, err) require.NoError(t, err)
teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams) teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams)
assert.NoError(t, err) require.NoError(t, err)
err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave) err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave)
assert.NoError(t, err) require.NoError(t, err)
errs = RemoveEmptySSOTeams(s, teamIDsToLeave) errs = RemoveEmptySSOTeams(s, teamIDsToLeave)
for _, err := range errs { for _, err := range errs {
assert.NoError(t, err) require.NoError(t, err)
} }
err = s.Commit() err = s.Commit()
assert.NoError(t, err) require.NoError(t, err)
db.AssertMissing(t, "teams", map[string]interface{}{ db.AssertMissing(t, "teams", map[string]interface{}{
"id": oidcTeams, "id": oidcTeams,
}) })