Fix tests

This commit is contained in:
kolaente 2021-04-11 16:49:03 +02:00
parent cfe8bfe054
commit da68699fd6
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
6 changed files with 224 additions and 199 deletions

View File

@ -69,13 +69,14 @@ func TestLabelTask_ReadAll(t *testing.T) {
Updated: testUpdatedTime, Updated: testUpdatedTime,
CreatedByID: 2, CreatedByID: 2,
CreatedBy: &user.User{ CreatedBy: &user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
}, },
}, },

View File

@ -48,14 +48,15 @@ func TestLabel_ReadAll(t *testing.T) {
page int page int
} }
user1 := &user.User{ user1 := &user.User{
ID: 1, ID: 1,
Username: "user1", Username: "user1",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
tests := []struct { tests := []struct {
name string name string
@ -98,13 +99,14 @@ func TestLabel_ReadAll(t *testing.T) {
Updated: testUpdatedTime, Updated: testUpdatedTime,
CreatedByID: 2, CreatedByID: 2,
CreatedBy: &user.User{ CreatedBy: &user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
}, },
}, },
@ -161,14 +163,15 @@ func TestLabel_ReadOne(t *testing.T) {
Rights web.Rights Rights web.Rights
} }
user1 := &user.User{ user1 := &user.User{
ID: 1, ID: 1,
Username: "user1", Username: "user1",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
tests := []struct { tests := []struct {
name string name string
@ -222,13 +225,14 @@ func TestLabel_ReadOne(t *testing.T) {
Title: "Label #4 - visible via other task", Title: "Label #4 - visible via other task",
CreatedByID: 2, CreatedByID: 2,
CreatedBy: &user.User{ CreatedBy: &user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
Created: testCreatedTime, Created: testCreatedTime,
Updated: testUpdatedTime, Updated: testUpdatedTime,

View File

@ -177,26 +177,28 @@ func TestListUser_ReadAll(t *testing.T) {
want: []*UserWithRight{ want: []*UserWithRight{
{ {
User: user.User{ User: user.User{
ID: 1, ID: 1,
Username: "user1", Username: "user1",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
Right: RightRead, Right: RightRead,
}, },
{ {
User: user.User{ User: user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
Right: RightRead, Right: RightRead,
}, },

View File

@ -176,26 +176,28 @@ func TestNamespaceUser_ReadAll(t *testing.T) {
want: []*UserWithRight{ want: []*UserWithRight{
{ {
User: user.User{ User: user.User{
ID: 1, ID: 1,
Username: "user1", Username: "user1",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
Right: RightRead, Right: RightRead,
}, },
{ {
User: user.User{ User: user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
}, },
Right: RightRead, Right: RightRead,
}, },

View File

@ -31,33 +31,36 @@ import (
func TestTaskCollection_ReadAll(t *testing.T) { func TestTaskCollection_ReadAll(t *testing.T) {
// Dummy users // Dummy users
user1 := &user.User{ user1 := &user.User{
ID: 1, ID: 1,
Username: "user1", Username: "user1",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
user2 := &user.User{ user2 := &user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
user6 := &user.User{ user6 := &user.User{
ID: 6, ID: 6,
Username: "user6", Username: "user6",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
IsActive: true, IsActive: true,
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
linkShareUser2 := &user.User{ linkShareUser2 := &user.User{
ID: -2, ID: -2,

View File

@ -26,139 +26,152 @@ import (
func TestListUsersFromList(t *testing.T) { func TestListUsersFromList(t *testing.T) {
testuser1 := &user.User{ testuser1 := &user.User{
ID: 1, ID: 1,
Username: "user1", Username: "user1",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser2 := &user.User{ testuser2 := &user.User{
ID: 2, ID: 2,
Username: "user2", Username: "user2",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser3 := &user.User{ testuser3 := &user.User{
ID: 3, ID: 3,
Username: "user3", Username: "user3",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
PasswordResetToken: "passwordresettesttoken", PasswordResetToken: "passwordresettesttoken",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser4 := &user.User{ testuser4 := &user.User{
ID: 4, ID: 4,
Username: "user4", Username: "user4",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: false, IsActive: false,
EmailConfirmToken: "tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael", EmailConfirmToken: "tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser5 := &user.User{ testuser5 := &user.User{
ID: 5, ID: 5,
Username: "user5", Username: "user5",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: false, IsActive: false,
EmailConfirmToken: "tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael", EmailConfirmToken: "tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael",
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser6 := &user.User{ testuser6 := &user.User{
ID: 6, ID: 6,
Username: "user6", Username: "user6",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser7 := &user.User{ testuser7 := &user.User{
ID: 7, ID: 7,
Username: "user7", Username: "user7",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
DiscoverableByEmail: true, DiscoverableByEmail: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser8 := &user.User{ testuser8 := &user.User{
ID: 8, ID: 8,
Username: "user8", Username: "user8",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser9 := &user.User{ testuser9 := &user.User{
ID: 9, ID: 9,
Username: "user9", Username: "user9",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser10 := &user.User{ testuser10 := &user.User{
ID: 10, ID: 10,
Username: "user10", Username: "user10",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser11 := &user.User{ testuser11 := &user.User{
ID: 11, ID: 11,
Username: "user11", Username: "user11",
Name: "Some one else", Name: "Some one else",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser12 := &user.User{ testuser12 := &user.User{
ID: 12, ID: 12,
Username: "user12", Username: "user12",
Name: "Name with spaces", Name: "Name with spaces",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
DiscoverableByName: true, DiscoverableByName: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
testuser13 := &user.User{ testuser13 := &user.User{
ID: 13, ID: 13,
Username: "user13", Username: "user13",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.", Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
IsActive: true, IsActive: true,
Issuer: "local", Issuer: "local",
EmailRemindersEnabled: true, EmailRemindersEnabled: true,
Created: testCreatedTime, OverdueTasksRemindersEnabled: true,
Updated: testUpdatedTime, Created: testCreatedTime,
Updated: testUpdatedTime,
} }
type args struct { type args struct {