vikunja
/
vikunja
6
43
Fork 72
Code Issues 150 Pull Requests 19 Packages Releases 32 Activity

Fix db fixtures init in tests
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
kolaente 2020-01-26 13:56:25 +01:00
parent bab91b4fbc
commit 6c88b4ecc9
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
22 changed files with 137 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/db/test_fixtures.go
View File

@ -19,8 +19,10 @@ package db
import (
"code.vikunja.io/api/pkg/config"
"github.com/stretchr/testify/assert"
"gopkg.in/testfixtures.v2"
"path/filepath"
"testing"
)
var fixtures *testfixtures.Context
@ -53,3 +55,8 @@ func InitFixtures(tablenames ...string) (err error) {
func LoadFixtures() error {
return fixtures.Load()
}
func LoadAndAssertFixtures(t *testing.T) {
err := LoadFixtures()
assert.NoError(t, err)
}

7
pkg/files/filehandling.go
View File

@ -43,10 +43,9 @@ func InitTestFileHandler() {
}
func initFixtures(t *testing.T) {
// Init db fixtures
err := db.LoadFixtures()
assert.NoError(t, err)
// DB fixtures
db.LoadAndAssertFixtures(t)
// File fixtures
InitTestFileFixtures(t)
}

3
pkg/models/bulk_task_test.go
View File

@ -1,6 +1,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"testing"
)
@ -53,6 +54,8 @@ func TestBulkTask_Update(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
bt := &BulkTask{
IDs: tt.fields.IDs,
Tasks: tt.fields.Tasks,

11
pkg/models/label_task_test.go
View File

@ -1,6 +1,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"gopkg.in/d4l3k/messagediff.v1"
"reflect"
@ -82,6 +83,8 @@ func TestLabelTask_ReadAll(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
l := &LabelTask{
ID: tt.fields.ID,
TaskID: tt.fields.TaskID,
@ -139,7 +142,7 @@ func TestLabelTask_Create(t *testing.T) {
name: "already existing",
fields: fields{
TaskID: 1,
LabelID: 1,
LabelID: 4,
},
args: args{
a: &user.User{ID: 1},
@ -174,6 +177,8 @@ func TestLabelTask_Create(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
l := &LabelTask{
ID: tt.fields.ID,
TaskID: tt.fields.TaskID,
@ -218,7 +223,7 @@ func TestLabelTask_Delete(t *testing.T) {
name: "normal",
fields: fields{
TaskID: 1,
LabelID: 1,
LabelID: 4,
},
auth: &user.User{ID: 1},
},
@ -261,6 +266,8 @@ func TestLabelTask_Delete(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
l := &LabelTask{
ID: tt.fields.ID,
TaskID: tt.fields.TaskID,

5
pkg/models/list_team_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/web"
"github.com/stretchr/testify/assert"
@ -26,6 +27,8 @@ import (
)
func TestTeamList(t *testing.T) {
db.LoadAndAssertFixtures(t)
// Dummy relation
tl := TeamList{
TeamID: 1,
@ -165,6 +168,8 @@ func TestTeamList_Update(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
tl := &TeamList{
ID: tt.fields.ID,
TeamID: tt.fields.TeamID,

23
pkg/models/list_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"reflect"
@ -32,7 +33,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
t.Run("create", func(t *testing.T) {
t.Run("normal", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
Title: "test",
Description: "Lorem Ipsum",
@ -42,7 +43,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
assert.NoError(t, err)
})
t.Run("nonexistant namespace", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
Title: "test",
Description: "Lorem Ipsum",
@ -54,7 +55,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
assert.True(t, IsErrNamespaceDoesNotExist(err))
})
t.Run("nonexistant owner", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
usr := &user.User{ID: 9482385}
list := List{
Title: "test",
@ -66,7 +67,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
assert.True(t, user.IsErrUserDoesNotExist(err))
})
t.Run("existing identifier", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
Title: "test",
Description: "Lorem Ipsum",
@ -82,7 +83,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
t.Run("update", func(t *testing.T) {
t.Run("normal", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
ID: 1,
Title: "test",
@ -95,7 +96,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
})
t.Run("nonexistant", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
ID: 99999999,
Title: "test",
@ -106,7 +107,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
})
t.Run("existing identifier", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
Title: "test",
Description: "Lorem Ipsum",
@ -122,7 +123,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
}
func TestList_Delete(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
list := List{
ID: 1,
}
@ -132,13 +133,15 @@ func TestList_Delete(t *testing.T) {
func TestList_ReadAll(t *testing.T) {
t.Run("all in namespace", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
// Get all lists for our namespace
lists, err := GetListsByNamespaceID(1, &user.User{})
assert.NoError(t, err)
assert.Equal(t, len(lists), 2)
})
t.Run("all lists for user", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
u := &user.User{ID: 1}
list := List{}
lists3, _, _, err := list.ReadAll(u, "", 1, 50)
@ -149,6 +152,8 @@ func TestList_ReadAll(t *testing.T) {
assert.Equal(t, 16, s.Len())
})
t.Run("lists for nonexistant user", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
usr := &user.User{ID: 999999}
list := List{}
_, _, _, err := list.ReadAll(usr, "", 1, 50)

3
pkg/models/list_users_rights_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"testing"
@ -76,6 +77,8 @@ func TestListUser_CanDoSomething(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
lu := &ListUser{
ID: tt.fields.ID,
UserID: tt.fields.UserID,

11
pkg/models/list_users_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"gopkg.in/d4l3k/messagediff.v1"
"reflect"
@ -59,7 +60,7 @@ func TestListUser_Create(t *testing.T) {
name: "ListUsers Create for duplicate",
fields: fields{
Username: "user1",
ListID: 2,
ListID: 3,
},
wantErr: true,
errType: IsErrUserAlreadyHasAccess,
@ -104,6 +105,8 @@ func TestListUser_Create(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
ul := &ListUser{
ID: tt.fields.ID,
UserID: tt.fields.UserID,
@ -194,6 +197,8 @@ func TestListUser_ReadAll(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
ul := &ListUser{
ID: tt.fields.ID,
UserID: tt.fields.UserID,
@ -272,6 +277,8 @@ func TestListUser_Update(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
lu := &ListUser{
ID: tt.fields.ID,
Username: tt.fields.Username,
@ -338,6 +345,8 @@ func TestListUser_Delete(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
lu := &ListUser{
ID: tt.fields.ID,
Username: tt.fields.Username,

3
pkg/models/namespace_team_rights_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"testing"
@ -76,6 +77,8 @@ func TestTeamNamespace_CanDoSomething(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
tn := &TeamNamespace{
ID: tt.fields.ID,
TeamID: tt.fields.TeamID,

5
pkg/models/namespace_team_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/web"
"github.com/stretchr/testify/assert"
@ -26,6 +27,8 @@ import (
)
func TestTeamNamespace(t *testing.T) {
db.LoadAndAssertFixtures(t)
// Dummy team <-> namespace relation
tn := TeamNamespace{
TeamID: 1,
@ -157,6 +160,8 @@ func TestTeamNamespace_Update(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
tl := &TeamNamespace{
ID: tt.fields.ID,
TeamID: tt.fields.TeamID,

3
pkg/models/namespace_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"reflect"
@ -24,6 +25,8 @@ import (
)
func TestNamespace_Create(t *testing.T) {
db.LoadAndAssertFixtures(t)
// Create test database
//assert.NoError(t, LoadFixtures())

3
pkg/models/namespace_users_rights_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"testing"
@ -76,6 +77,8 @@ func TestNamespaceUser_CanDoSomething(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
nu := &NamespaceUser{
ID: tt.fields.ID,
UserID: tt.fields.UserID,

11
pkg/models/namespace_users_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/web"
"gopkg.in/d4l3k/messagediff.v1"
@ -57,7 +58,7 @@ func TestNamespaceUser_Create(t *testing.T) {
name: "NamespaceUsers Create for duplicate",
fields: fields{
Username: "user1",
NamespaceID: 2,
NamespaceID: 3,
},
wantErr: true,
errType: IsErrUserAlreadyHasNamespaceAccess,
@ -102,6 +103,8 @@ func TestNamespaceUser_Create(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
un := &NamespaceUser{
ID: tt.fields.ID,
Username: tt.fields.Username,
@ -191,6 +194,8 @@ func TestNamespaceUser_ReadAll(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
un := &NamespaceUser{
ID: tt.fields.ID,
UserID: tt.fields.UserID,
@ -270,6 +275,8 @@ func TestNamespaceUser_Update(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
nu := &NamespaceUser{
ID: tt.fields.ID,
Username: tt.fields.Username,
@ -336,6 +343,8 @@ func TestNamespaceUser_Delete(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
nu := &NamespaceUser{
ID: tt.fields.ID,
Username: tt.fields.Username,

5
pkg/models/task_collection_test.go
View File

@ -21,14 +21,11 @@ import (
"code.vikunja.io/api/pkg/files"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/web"
"github.com/stretchr/testify/assert"
"gopkg.in/d4l3k/messagediff.v1"
"testing"
)
func TestTaskCollection_ReadAll(t *testing.T) {
assert.NoError(t, db.LoadFixtures())
// Dummy users
user1 := &user.User{
ID: 1,
@ -678,6 +675,8 @@ func TestTaskCollection_ReadAll(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
lt := &TaskCollection{
ListID: tt.fields.ListID,
StartDateSortUnix: tt.fields.StartDateSortUnix,

27
pkg/models/task_relation_test.go
View File

@ -18,6 +18,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"testing"
@ -25,6 +26,8 @@ import (
func TestTaskRelation_Create(t *testing.T) {
t.Run("Normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 2,
@ -34,6 +37,8 @@ func TestTaskRelation_Create(t *testing.T) {
assert.NoError(t, err)
})
t.Run("Two Tasks In Different Lists", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 13,
@ -43,6 +48,8 @@ func TestTaskRelation_Create(t *testing.T) {
assert.NoError(t, err)
})
t.Run("Already Existing", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 29,
@ -53,6 +60,8 @@ func TestTaskRelation_Create(t *testing.T) {
assert.True(t, IsErrRelationAlreadyExists(err))
})
t.Run("Same Task", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 1,
@ -65,6 +74,8 @@ func TestTaskRelation_Create(t *testing.T) {
func TestTaskRelation_Delete(t *testing.T) {
t.Run("Normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 29,
@ -74,6 +85,8 @@ func TestTaskRelation_Delete(t *testing.T) {
assert.NoError(t, err)
})
t.Run("Not existing", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 9999,
OtherTaskID: 3,
@ -87,6 +100,8 @@ func TestTaskRelation_Delete(t *testing.T) {
func TestTaskRelation_CanCreate(t *testing.T) {
t.Run("Normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 2,
@ -97,6 +112,8 @@ func TestTaskRelation_CanCreate(t *testing.T) {
assert.True(t, can)
})
t.Run("Two tasks on different lists", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 13,
@ -107,6 +124,8 @@ func TestTaskRelation_CanCreate(t *testing.T) {
assert.True(t, can)
})
t.Run("No update rights on base task", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 14,
OtherTaskID: 1,
@ -117,6 +136,8 @@ func TestTaskRelation_CanCreate(t *testing.T) {
assert.False(t, can)
})
t.Run("No update rights on base task, but read rights", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 15,
OtherTaskID: 1,
@ -127,6 +148,8 @@ func TestTaskRelation_CanCreate(t *testing.T) {
assert.False(t, can)
})
t.Run("No read rights on other task", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 14,
@ -137,6 +160,8 @@ func TestTaskRelation_CanCreate(t *testing.T) {
assert.False(t, can)
})
t.Run("Nonexisting base task", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 999999,
OtherTaskID: 1,
@ -148,6 +173,8 @@ func TestTaskRelation_CanCreate(t *testing.T) {
assert.False(t, can)
})
t.Run("Nonexisting other task", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
rel := TaskRelation{
TaskID: 1,
OtherTaskID: 999999,

23
pkg/models/tasks_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"testing"
@ -32,7 +33,7 @@ func TestTask_Create(t *testing.T) {
// We only test creating a task here, the rights are all well tested in the integration tests.
t.Run("normal", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{
Text: "Lorem",
Description: "Lorem Ipsum Dolor",
@ -48,7 +49,7 @@ func TestTask_Create(t *testing.T) {
})
t.Run("empty text", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{
Text: "",
Description: "Lorem Ipsum Dolor",
@ -59,7 +60,7 @@ func TestTask_Create(t *testing.T) {
assert.True(t, IsErrTaskCannotBeEmpty(err))
})
t.Run("nonexistant list", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{
Text: "Test",
Description: "Lorem Ipsum Dolor",
@ -69,8 +70,8 @@ func TestTask_Create(t *testing.T) {
assert.Error(t, err)
assert.True(t, IsErrListDoesNotExist(err))
})
t.Run("noneixtant usr", func(t *testing.T) {
initFixtures(t)
t.Run("noneixtant user", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
nUser := &user.User{ID: 99999999}
task := &Task{
Text: "Test",
@ -85,7 +86,7 @@ func TestTask_Create(t *testing.T) {
func TestTask_Update(t *testing.T) {
t.Run("normal", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{
ID: 1,
Text: "test10000",
@ -96,7 +97,7 @@ func TestTask_Update(t *testing.T) {
assert.NoError(t, err)
})
t.Run("nonexistant task", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{
ID: 9999999,
Text: "test10000",
@ -111,7 +112,7 @@ func TestTask_Update(t *testing.T) {
func TestTask_Delete(t *testing.T) {
t.Run("normal", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{
ID: 1,
}
@ -122,12 +123,14 @@ func TestTask_Delete(t *testing.T) {
func TestUpdateDone(t *testing.T) {
t.Run("marking a task as done", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
oldTask := &Task{Done: false}
newTask := &Task{Done: true}
updateDone(oldTask, newTask)
assert.NotEqual(t, int64(0), oldTask.DoneAtUnix)
})
t.Run("unmarking a task as done", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
oldTask := &Task{Done: true}
newTask := &Task{Done: false}
updateDone(oldTask, newTask)
@ -137,14 +140,14 @@ func TestUpdateDone(t *testing.T) {
func TestTask_ReadOne(t *testing.T) {
t.Run("default", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{ID: 1}
err := task.ReadOne()
assert.NoError(t, err)
assert.Equal(t, "task #1", task.Text)
})
t.Run("nonexisting", func(t *testing.T) {
initFixtures(t)
db.LoadAndAssertFixtures(t)
task := &Task{ID: 99999}
err := task.ReadOne()
assert.Error(t, err)

2
pkg/models/team_members_test.go
View File

@ -17,12 +17,14 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"testing"
)
func TestTeamMember_Create(t *testing.T) {
db.LoadAndAssertFixtures(t)
// Dummy team member
dummyteammember := TeamMember{

3
pkg/models/teams_rights_test.go
View File

@ -17,6 +17,7 @@
package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"testing"
@ -78,6 +79,8 @@ func TestTeam_CanDoSomething(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
tm := &Team{
ID: tt.fields.ID,
Name: tt.fields.Name,

13
pkg/models/unit_tests.go
View File

@ -21,8 +21,6 @@ import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/mail"
"github.com/stretchr/testify/assert"
"testing"
)
// SetupTests takes care of seting up the db, fixtures etc.
@ -64,15 +62,4 @@ func SetupTests() {
// Start the pseudo mail queue
mail.StartMailDaemon()
// Create test database
if err = db.LoadFixtures(); err != nil {
log.Fatalf("Error preparing test database: %v", err.Error())
}
}
func initFixtures(t *testing.T) {
// Init db fixtures
err := db.LoadFixtures()
assert.NoError(t, err)
}

7
pkg/models/users_list_test.go
View File

@ -20,16 +20,11 @@ package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"gopkg.in/d4l3k/messagediff.v1"
"testing"
)
func TestListUsersFromList(t *testing.T) {
err := db.LoadFixtures()
assert.NoError(t, err)
testuser1 := &user.User{
ID: 1,
Username: "user1",
@ -165,6 +160,8 @@ func TestListUsersFromList(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db.LoadAndAssertFixtures(t)
gotUsers, err := ListUsersFromList(tt.args.l, tt.args.search)
if (err != nil) != tt.wantErr {
t.Errorf("ListUsersFromList() error = %v, wantErr %v", err, tt.wantErr)

4
pkg/user/user_email_confirm_test.go
View File

@ -18,10 +18,14 @@
package user
import (
"code.vikunja.io/api/pkg/db"
"testing"
)
func TestUserEmailConfirm(t *testing.T) {
db.LoadAndAssertFixtures(t)
type args struct {
c *EmailConfirm
}

8
pkg/user/user_test.go
View File

@ -18,14 +18,15 @@
package user
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/utils"
"github.com/stretchr/testify/assert"
"testing"
)
func TestCreateUser(t *testing.T) {
// Create test database
//assert.NoError(t, LoadFixtures())
db.LoadAndAssertFixtures(t)
// Our dummy user for testing
dummyuser := &User{
@ -132,6 +133,9 @@ func TestCreateUser(t *testing.T) {
}
func TestUserPasswordReset(t *testing.T) {
db.LoadAndAssertFixtures(t)
// Request a new token
tr := &PasswordTokenRequest{
Email: "user1@example.com",