vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 15 Packages Releases 32 Activity

Fix tests

This commit is contained in:
kolaente 2021-02-01 22:17:46 +01:00
parent bd104298ad
commit 037295cd1a
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
19 changed files with 104 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/bulk_task_test.go
View File

@ -84,7 +84,7 @@ func TestBulkTask_Update(t *testing.T) {
if !allowed != tt.wantForbidden {
t.Errorf("BulkTask.Update() want forbidden, got %v, want %v", allowed, tt.wantForbidden)
}
if err := bt.Update(s); (err != nil) != tt.wantErr {
if err := bt.Update(s, tt.fields.User); (err != nil) != tt.wantErr {
t.Errorf("BulkTask.Update() error = %v, wantErr %v", err, tt.wantErr)
}

8
pkg/models/kanban_test.go
View File

@ -92,6 +92,8 @@ func TestBucket_ReadAll(t *testing.T) {
}
func TestBucket_Delete(t *testing.T) {
user := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -101,7 +103,7 @@ func TestBucket_Delete(t *testing.T) {
ID: 2, // The second bucket only has 3 tasks
ListID: 1,
}
err := b.Delete(s)
err := b.Delete(s, user)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -125,7 +127,7 @@ func TestBucket_Delete(t *testing.T) {
ID: 34,
ListID: 18,
}
err := b.Delete(s)
err := b.Delete(s, user)
assert.Error(t, err)
assert.True(t, IsErrCannotRemoveLastBucket(err))
err = s.Commit()
@ -141,7 +143,7 @@ func TestBucket_Delete(t *testing.T) {
func TestBucket_Update(t *testing.T) {
testAndAssertBucketUpdate := func(t *testing.T, b *Bucket, s *xorm.Session) {
err := b.Update(s)
err := b.Update(s, &user.User{ID: 1})
assert.NoError(t, err)
err = s.Commit()

2
pkg/models/label_task_test.go
View File

@ -318,7 +318,7 @@ func TestLabelTask_Delete(t *testing.T) {
if !allowed && !tt.wantForbidden {
t.Errorf("LabelTask.CanDelete() forbidden, want %v", tt.wantForbidden)
}
err := l.Delete(s)
err := l.Delete(s, tt.auth)
if (err != nil) != tt.wantErr {
t.Errorf("LabelTask.Delete() error = %v, wantErr %v", err, tt.wantErr)
}

6
pkg/models/label_test.go
View File

@ -257,7 +257,7 @@ func TestLabel_ReadOne(t *testing.T) {
if !allowed && !tt.wantForbidden {
t.Errorf("Label.CanRead() forbidden, want %v", tt.wantForbidden)
}
err := l.ReadOne(s)
err := l.ReadOne(s, tt.auth)
if (err != nil) != tt.wantErr {
t.Errorf("Label.ReadOne() error = %v, wantErr %v", err, tt.wantErr)
}
@ -419,7 +419,7 @@ func TestLabel_Update(t *testing.T) {
if !allowed && !tt.wantForbidden {
t.Errorf("Label.CanUpdate() forbidden, want %v", tt.wantForbidden)
}
if err := l.Update(s); (err != nil) != tt.wantErr {
if err := l.Update(s, tt.auth); (err != nil) != tt.wantErr {
t.Errorf("Label.Update() error = %v, wantErr %v", err, tt.wantErr)
}
if !tt.wantErr && !tt.wantForbidden {
@ -505,7 +505,7 @@ func TestLabel_Delete(t *testing.T) {
if !allowed && !tt.wantForbidden {
t.Errorf("Label.CanDelete() forbidden, want %v", tt.wantForbidden)
}
if err := l.Delete(s); (err != nil) != tt.wantErr {
if err := l.Delete(s, tt.auth); (err != nil) != tt.wantErr {
t.Errorf("Label.Delete() error = %v, wantErr %v", err, tt.wantErr)
}
if !tt.wantErr && !tt.wantForbidden {

10
pkg/models/list_team_test.go
View File

@ -158,6 +158,8 @@ func TestTeamList_Create(t *testing.T) {
}
func TestTeamList_Delete(t *testing.T) {
user := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -165,7 +167,7 @@ func TestTeamList_Delete(t *testing.T) {
TeamID: 1,
ListID: 3,
}
err := tl.Delete(s)
err := tl.Delete(s, user)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -181,7 +183,7 @@ func TestTeamList_Delete(t *testing.T) {
TeamID: 9999,
ListID: 1,
}
err := tl.Delete(s)
err := tl.Delete(s, user)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotExist(err))
_ = s.Close()
@ -193,7 +195,7 @@ func TestTeamList_Delete(t *testing.T) {
TeamID: 1,
ListID: 9999,
}
err := tl.Delete(s)
err := tl.Delete(s, user)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotHaveAccessToList(err))
_ = s.Close()
@ -267,7 +269,7 @@ func TestTeamList_Update(t *testing.T) {
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
err := tl.Update(s)
err := tl.Update(s, &user.User{ID: 1})
if (err != nil) != tt.wantErr {
t.Errorf("TeamList.Update() error = %v, wantErr %v", err, tt.wantErr)
}

6
pkg/models/list_test.go
View File

@ -125,7 +125,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
NamespaceID: 1,
}
list.Description = "Lorem Ipsum dolor sit amet."
err := list.Update(s)
err := list.Update(s, usr)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -143,7 +143,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
ID: 99999999,
Title: "test",
}
err := list.Update(s)
err := list.Update(s, usr)
assert.Error(t, err)
assert.True(t, IsErrListDoesNotExist(err))
_ = s.Close()
@ -172,7 +172,7 @@ func TestList_Delete(t *testing.T) {
list := List{
ID: 1,
}
err := list.Delete(s)
err := list.Delete(s, &user.User{ID: 1})
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)

4
pkg/models/list_users_test.go
View File

@ -311,7 +311,7 @@ func TestListUser_Update(t *testing.T) {
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
err := lu.Update(s)
err := lu.Update(s, &user.User{ID: 1})
if (err != nil) != tt.wantErr {
t.Errorf("ListUser.Update() error = %v, wantErr %v", err, tt.wantErr)
}
@ -393,7 +393,7 @@ func TestListUser_Delete(t *testing.T) {
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
err := lu.Delete(s)
err := lu.Delete(s, &user.User{ID: 1})
if (err != nil) != tt.wantErr {
t.Errorf("ListUser.Delete() error = %v, wantErr %v", err, tt.wantErr)
}

3
pkg/models/main_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/events"
"fmt"
"os"
"testing"
@ -64,5 +65,7 @@ func TestMain(m *testing.M) {
SetupTests()
events.Fake()
os.Exit(m.Run())
}

8
pkg/models/namespace_team_test.go
View File

@ -157,7 +157,7 @@ func TestTeamNamespace_Delete(t *testing.T) {
s := db.NewSession()
allowed, _ := tn.CanDelete(s, u)
assert.True(t, allowed)
err := tn.Delete(s)
err := tn.Delete(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -174,7 +174,7 @@ func TestTeamNamespace_Delete(t *testing.T) {
}
db.LoadAndAssertFixtures(t)
s := db.NewSession()
err := tn.Delete(s)
err := tn.Delete(s, u)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotExist(err))
_ = s.Close()
@ -186,7 +186,7 @@ func TestTeamNamespace_Delete(t *testing.T) {
}
db.LoadAndAssertFixtures(t)
s := db.NewSession()
err := tn.Delete(s)
err := tn.Delete(s, u)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotHaveAccessToNamespace(err))
_ = s.Close()
@ -260,7 +260,7 @@ func TestTeamNamespace_Update(t *testing.T) {
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
err := tl.Update(s)
err := tl.Update(s, &user.User{ID: 1})
if (err != nil) != tt.wantErr {
t.Errorf("TeamNamespace.Update() error = %v, wantErr %v", err, tt.wantErr)
}

22
pkg/models/namespace_test.go
View File

@ -69,11 +69,13 @@ func TestNamespace_Create(t *testing.T) {
}
func TestNamespace_ReadOne(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
n := &Namespace{ID: 1}
db.LoadAndAssertFixtures(t)
s := db.NewSession()
err := n.ReadOne(s)
err := n.ReadOne(s, u)
assert.NoError(t, err)
assert.Equal(t, n.Title, "testnamespace")
_ = s.Close()
@ -82,7 +84,7 @@ func TestNamespace_ReadOne(t *testing.T) {
n := &Namespace{ID: 99999}
db.LoadAndAssertFixtures(t)
s := db.NewSession()
err := n.ReadOne(s)
err := n.ReadOne(s, u)
assert.Error(t, err)
assert.True(t, IsErrNamespaceDoesNotExist(err))
_ = s.Close()
@ -90,6 +92,8 @@ func TestNamespace_ReadOne(t *testing.T) {
}
func TestNamespace_Update(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -97,7 +101,7 @@ func TestNamespace_Update(t *testing.T) {
ID: 1,
Title: "Lorem Ipsum",
}
err := n.Update(s)
err := n.Update(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -114,7 +118,7 @@ func TestNamespace_Update(t *testing.T) {
ID: 99999,
Title: "Lorem Ipsum",
}
err := n.Update(s)
err := n.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrNamespaceDoesNotExist(err))
_ = s.Close()
@ -127,7 +131,7 @@ func TestNamespace_Update(t *testing.T) {
Title: "Lorem Ipsum",
Owner: &user.User{ID: 99999},
}
err := n.Update(s)
err := n.Update(s, u)
assert.Error(t, err)
assert.True(t, user.IsErrUserDoesNotExist(err))
_ = s.Close()
@ -138,7 +142,7 @@ func TestNamespace_Update(t *testing.T) {
n := &Namespace{
ID: 1,
}
err := n.Update(s)
err := n.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrNamespaceNameCannotBeEmpty(err))
_ = s.Close()
@ -146,13 +150,15 @@ func TestNamespace_Update(t *testing.T) {
}
func TestNamespace_Delete(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
n := &Namespace{
ID: 1,
}
err := n.Delete(s)
err := n.Delete(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -167,7 +173,7 @@ func TestNamespace_Delete(t *testing.T) {
n := &Namespace{
ID: 9999,
}
err := n.Delete(s)
err := n.Delete(s, u)
assert.Error(t, err)
assert.True(t, IsErrNamespaceDoesNotExist(err))
_ = s.Close()

4
pkg/models/namespace_users_test.go
View File

@ -315,7 +315,7 @@ func TestNamespaceUser_Update(t *testing.T) {
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
err := nu.Update(s)
err := nu.Update(s, &user.User{ID: 1})
if (err != nil) != tt.wantErr {
t.Errorf("NamespaceUser.Update() error = %v, wantErr %v", err, tt.wantErr)
}
@ -396,7 +396,7 @@ func TestNamespaceUser_Delete(t *testing.T) {
CRUDable: tt.fields.CRUDable,
Rights: tt.fields.Rights,
}
err := nu.Delete(s)
err := nu.Delete(s, &user.User{ID: 1})
if (err != nil) != tt.wantErr {
t.Errorf("NamespaceUser.Delete() error = %v, wantErr %v", err, tt.wantErr)
}

6
pkg/models/saved_filters_test.go
View File

@ -86,7 +86,7 @@ func TestSavedFilter_ReadOne(t *testing.T) {
// canRead pre-populates the struct
_, _, err := sf.CanRead(s, user1)
assert.NoError(t, err)
err = sf.ReadOne(s)
err = sf.ReadOne(s, user1)
assert.NoError(t, err)
assert.NotNil(t, sf.Owner)
}
@ -102,7 +102,7 @@ func TestSavedFilter_Update(t *testing.T) {
Description: "", // Explicitly reset the description
Filters: &TaskCollection{},
}
err := sf.Update(s)
err := sf.Update(s, &user.User{ID: 1})
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -121,7 +121,7 @@ func TestSavedFilter_Delete(t *testing.T) {
sf := &SavedFilter{
ID: 1,
}
err := sf.Delete(s)
err := sf.Delete(s, &user.User{ID: 1})
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)

16
pkg/models/task_attachment_test.go
View File

@ -30,6 +30,8 @@ import (
)
func TestTaskAttachment_ReadOne(t *testing.T) {
u := &user.User{ID: 1}
t.Run("Normal File", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -39,7 +41,7 @@ func TestTaskAttachment_ReadOne(t *testing.T) {
ta := &TaskAttachment{
ID: 1,
}
err := ta.ReadOne(s)
err := ta.ReadOne(s, u)
assert.NoError(t, err)
assert.NotNil(t, ta.File)
assert.True(t, ta.File.ID == ta.FileID && ta.FileID != 0)
@ -63,7 +65,7 @@ func TestTaskAttachment_ReadOne(t *testing.T) {
ta := &TaskAttachment{
ID: 9999,
}
err := ta.ReadOne(s)
err := ta.ReadOne(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskAttachmentDoesNotExist(err))
})
@ -76,7 +78,7 @@ func TestTaskAttachment_ReadOne(t *testing.T) {
ta := &TaskAttachment{
ID: 2,
}
err := ta.ReadOne(s)
err := ta.ReadOne(s, u)
assert.Error(t, err)
assert.EqualError(t, err, "file 9999 does not exist")
})
@ -153,10 +155,12 @@ func TestTaskAttachment_Delete(t *testing.T) {
s := db.NewSession()
defer s.Close()
u := &user.User{ID: 1}
files.InitTestFileFixtures(t)
t.Run("Normal", func(t *testing.T) {
ta := &TaskAttachment{ID: 1}
err := ta.Delete(s)
err := ta.Delete(s, u)
assert.NoError(t, err)
// Check if the file itself was deleted
_, err = files.FileStat("/1") // The new file has the id 2 since it's the second attachment
@ -165,14 +169,14 @@ func TestTaskAttachment_Delete(t *testing.T) {
t.Run("Nonexisting", func(t *testing.T) {
files.InitTestFileFixtures(t)
ta := &TaskAttachment{ID: 9999}
err := ta.Delete(s)
err := ta.Delete(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskAttachmentDoesNotExist(err))
})
t.Run("Existing attachment, nonexisting file", func(t *testing.T) {
files.InitTestFileFixtures(t)
ta := &TaskAttachment{ID: 2}
err := ta.Delete(s)
err := ta.Delete(s, u)
assert.NoError(t, err)
})
}

18
pkg/models/task_comments_test.go
View File

@ -65,13 +65,15 @@ func TestTaskComment_Create(t *testing.T) {
}
func TestTaskComment_Delete(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
tc := &TaskComment{ID: 1}
err := tc.Delete(s)
err := tc.Delete(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -86,13 +88,15 @@ func TestTaskComment_Delete(t *testing.T) {
defer s.Close()
tc := &TaskComment{ID: 9999}
err := tc.Delete(s)
err := tc.Delete(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskCommentDoesNotExist(err))
})
}
func TestTaskComment_Update(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -102,7 +106,7 @@ func TestTaskComment_Update(t *testing.T) {
ID: 1,
Comment: "testing",
}
err := tc.Update(s)
err := tc.Update(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -120,20 +124,22 @@ func TestTaskComment_Update(t *testing.T) {
tc := &TaskComment{
ID: 9999,
}
err := tc.Update(s)
err := tc.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskCommentDoesNotExist(err))
})
}
func TestTaskComment_ReadOne(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
tc := &TaskComment{ID: 1}
err := tc.ReadOne(s)
err := tc.ReadOne(s, u)
assert.NoError(t, err)
assert.Equal(t, "Lorem Ipsum Dolor Sit Amet", tc.Comment)
assert.NotEmpty(t, tc.Author.ID)
@ -144,7 +150,7 @@ func TestTaskComment_ReadOne(t *testing.T) {
defer s.Close()
tc := &TaskComment{ID: 9999}
err := tc.ReadOne(s)
err := tc.ReadOne(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskCommentDoesNotExist(err))
})

6
pkg/models/task_relation_test.go
View File

@ -97,6 +97,8 @@ func TestTaskRelation_Create(t *testing.T) {
}
func TestTaskRelation_Delete(t *testing.T) {
u := &user.User{ID: 1}
t.Run("Normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -107,7 +109,7 @@ func TestTaskRelation_Delete(t *testing.T) {
OtherTaskID: 29,
RelationKind: RelationKindSubtask,
}
err := rel.Delete(s)
err := rel.Delete(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -127,7 +129,7 @@ func TestTaskRelation_Delete(t *testing.T) {
OtherTaskID: 3,
RelationKind: RelationKindSubtask,
}
err := rel.Delete(s)
err := rel.Delete(s, u)
assert.Error(t, err)
assert.True(t, IsErrRelationDoesNotExist(err))
})

18
pkg/models/tasks_test.go
View File

@ -127,6 +127,8 @@ func TestTask_Create(t *testing.T) {
}
func TestTask_Update(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -138,7 +140,7 @@ func TestTask_Update(t *testing.T) {
Description: "Lorem Ipsum Dolor",
ListID: 1,
}
err := task.Update(s)
err := task.Update(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -161,7 +163,7 @@ func TestTask_Update(t *testing.T) {
Description: "Lorem Ipsum Dolor",
ListID: 1,
}
err := task.Update(s)
err := task.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskDoesNotExist(err))
})
@ -177,7 +179,7 @@ func TestTask_Update(t *testing.T) {
ListID: 1,
BucketID: 2, // Bucket 2 already has 3 tasks and a limit of 3
}
err := task.Update(s)
err := task.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrBucketLimitExceeded(err))
})
@ -194,7 +196,7 @@ func TestTask_Update(t *testing.T) {
ListID: 1,
BucketID: 2, // Bucket 2 already has 3 tasks and a limit of 3
}
err := task.Update(s)
err := task.Update(s, u)
assert.NoError(t, err)
})
}
@ -208,7 +210,7 @@ func TestTask_Delete(t *testing.T) {
task := &Task{
ID: 1,
}
err := task.Delete(s)
err := task.Delete(s, &user.User{ID: 1})
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -440,13 +442,15 @@ func TestUpdateDone(t *testing.T) {
}
func TestTask_ReadOne(t *testing.T) {
u := &user.User{ID: 1}
t.Run("default", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
task := &Task{ID: 1}
err := task.ReadOne(s)
err := task.ReadOne(s, u)
assert.NoError(t, err)
assert.Equal(t, "task #1", task.Title)
})
@ -456,7 +460,7 @@ func TestTask_ReadOne(t *testing.T) {
defer s.Close()
task := &Task{ID: 99999}
err := task.ReadOne(s)
err := task.ReadOne(s, u)
assert.Error(t, err)
assert.True(t, IsErrTaskDoesNotExist(err))
})

8
pkg/models/team_members_test.go
View File

@ -101,7 +101,7 @@ func TestTeamMember_Delete(t *testing.T) {
TeamID: 1,
Username: "user1",
}
err := tm.Delete(s)
err := tm.Delete(s, &user.User{ID: 1})
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -114,6 +114,8 @@ func TestTeamMember_Delete(t *testing.T) {
}
func TestTeamMember_Update(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -124,7 +126,7 @@ func TestTeamMember_Update(t *testing.T) {
Username: "user1",
Admin: true,
}
err := tm.Update(s)
err := tm.Update(s, u)
assert.NoError(t, err)
assert.False(t, tm.Admin) // Since this endpoint toggles the right, we should get a false for admin back.
err = s.Commit()
@ -148,7 +150,7 @@ func TestTeamMember_Update(t *testing.T) {
Username: "user1",
Admin: true,
}
err := tm.Update(s)
err := tm.Update(s, u)
assert.NoError(t, err)
assert.False(t, tm.Admin)
err = s.Commit()

20
pkg/models/teams_test.go
View File

@ -62,13 +62,15 @@ func TestTeam_Create(t *testing.T) {
}
func TestTeam_ReadOne(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
team := &Team{ID: 1}
err := team.ReadOne(s)
err := team.ReadOne(s, u)
assert.NoError(t, err)
assert.Equal(t, "testteam1", team.Name)
assert.Equal(t, "Lorem Ipsum", team.Description)
@ -81,7 +83,7 @@ func TestTeam_ReadOne(t *testing.T) {
defer s.Close()
team := &Team{ID: -1}
err := team.ReadOne(s)
err := team.ReadOne(s, u)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotExist(err))
})
@ -91,7 +93,7 @@ func TestTeam_ReadOne(t *testing.T) {
defer s.Close()
team := &Team{ID: 99999}
err := team.ReadOne(s)
err := team.ReadOne(s, u)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotExist(err))
})
@ -113,6 +115,8 @@ func TestTeam_ReadAll(t *testing.T) {
}
func TestTeam_Update(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -122,7 +126,7 @@ func TestTeam_Update(t *testing.T) {
ID: 1,
Name: "SomethingNew",
}
err := team.Update(s)
err := team.Update(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)
@ -140,7 +144,7 @@ func TestTeam_Update(t *testing.T) {
ID: 1,
Name: "",
}
err := team.Update(s)
err := team.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrTeamNameCannotBeEmpty(err))
})
@ -153,13 +157,15 @@ func TestTeam_Update(t *testing.T) {
ID: 9999,
Name: "SomethingNew",
}
err := team.Update(s)
err := team.Update(s, u)
assert.Error(t, err)
assert.True(t, IsErrTeamDoesNotExist(err))
})
}
func TestTeam_Delete(t *testing.T) {
u := &user.User{ID: 1}
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
@ -168,7 +174,7 @@ func TestTeam_Delete(t *testing.T) {
team := &Team{
ID: 1,
}
err := team.Delete(s)
err := team.Delete(s, u)
assert.NoError(t, err)
err = s.Commit()
assert.NoError(t, err)

2
pkg/modules/auth/openid/main_test.go
View File

@ -17,6 +17,7 @@
package openid
import (
"code.vikunja.io/api/pkg/events"
"os"
"testing"
@ -30,5 +31,6 @@ func TestMain(m *testing.M) {
user.InitTests()
files.InitTests()
models.SetupTests()
events.Fake()
os.Exit(m.Run())
}