Use db sessions everywere #750
|
@ -27,6 +27,8 @@ import (
|
||||||
func TestBucket_ReadAll(t *testing.T) {
|
func TestBucket_ReadAll(t *testing.T) {
|
||||||
t.Run("normal", func(t *testing.T) {
|
t.Run("normal", func(t *testing.T) {
|
||||||
db.LoadAndAssertFixtures(t)
|
db.LoadAndAssertFixtures(t)
|
||||||
|
s := db.NewSession()
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
testuser := &user.User{ID: 1}
|
testuser := &user.User{ID: 1}
|
||||||
b := &Bucket{ListID: 1}
|
b := &Bucket{ListID: 1}
|
||||||
|
@ -66,6 +68,8 @@ func TestBucket_ReadAll(t *testing.T) {
|
||||||
})
|
})
|
||||||
t.Run("filtered", func(t *testing.T) {
|
t.Run("filtered", func(t *testing.T) {
|
||||||
db.LoadAndAssertFixtures(t)
|
db.LoadAndAssertFixtures(t)
|
||||||
|
s := db.NewSession()
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
testuser := &user.User{ID: 1}
|
testuser := &user.User{ID: 1}
|
||||||
b := &Bucket{
|
b := &Bucket{
|
||||||
|
@ -88,16 +92,21 @@ func TestBucket_ReadAll(t *testing.T) {
|
||||||
func TestBucket_Delete(t *testing.T) {
|
func TestBucket_Delete(t *testing.T) {
|
||||||
t.Run("normal", func(t *testing.T) {
|
t.Run("normal", func(t *testing.T) {
|
||||||
db.LoadAndAssertFixtures(t)
|
db.LoadAndAssertFixtures(t)
|
||||||
|
s := db.NewSession()
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
b := &Bucket{
|
b := &Bucket{
|
||||||
ID: 2, // The second bucket only has 3 tasks
|
ID: 2, // The second bucket only has 3 tasks
|
||||||
ListID: 1,
|
ListID: 1,
|
||||||
}
|
}
|
||||||
err := b.Delete(s)
|
err := b.Delete(s)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
err = s.Commit()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
// Assert all tasks have been moved to bucket 1 as that one is the first
|
// Assert all tasks have been moved to bucket 1 as that one is the first
|
||||||
tasks := []*Task{}
|
tasks := []*Task{}
|
||||||
err = x.Where("bucket_id = ?", 1).Find(&tasks)
|
err = s.Where("bucket_id = ?", 1).Find(&tasks)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, tasks, 15)
|
assert.Len(t, tasks, 15)
|
||||||
db.AssertMissing(t, "buckets", map[string]interface{}{
|
db.AssertMissing(t, "buckets", map[string]interface{}{
|
||||||
|
@ -107,6 +116,9 @@ func TestBucket_Delete(t *testing.T) {
|
||||||
})
|
})
|
||||||
t.Run("last bucket in list", func(t *testing.T) {
|
t.Run("last bucket in list", func(t *testing.T) {
|
||||||
db.LoadAndAssertFixtures(t)
|
db.LoadAndAssertFixtures(t)
|
||||||
|
s := db.NewSession()
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
b := &Bucket{
|
b := &Bucket{
|
||||||
ID: 34,
|
ID: 34,
|
||||||
ListID: 18,
|
ListID: 18,
|
||||||
|
@ -114,6 +126,9 @@ func TestBucket_Delete(t *testing.T) {
|
||||||
err := b.Delete(s)
|
err := b.Delete(s)
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
assert.True(t, IsErrCannotRemoveLastBucket(err))
|
assert.True(t, IsErrCannotRemoveLastBucket(err))
|
||||||
|
err = s.Commit()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
db.AssertExists(t, "buckets", map[string]interface{}{
|
db.AssertExists(t, "buckets", map[string]interface{}{
|
||||||
"id": 34,
|
"id": 34,
|
||||||
"list_id": 18,
|
"list_id": 18,
|
||||||
|
|
|
@ -212,6 +212,6 @@ func TestList_ReadAll(t *testing.T) {
|
||||||
_, _, _, err := list.ReadAll(s, usr, "", 1, 50)
|
_, _, _, err := list.ReadAll(s, usr, "", 1, 50)
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
assert.True(t, user.IsErrUserDoesNotExist(err))
|
assert.True(t, user.IsErrUserDoesNotExist(err))
|
||||||
_ = x.Close()
|
_ = s.Close()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -339,7 +339,7 @@ func (t *Team) Update(s *xorm.Session) (err error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = x.ID(t.ID).Update(t)
|
_, err = s.ID(t.ID).Update(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user