From 28c4c696148275836f1d6ad0efc8543636b7a783 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 7 Dec 2019 21:19:04 +0100
Subject: [PATCH] More refactoring of old tests

---
 pkg/models/list_test.go | 47 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/pkg/models/list_test.go b/pkg/models/list_test.go
index dd6cdef32..468038604 100644
--- a/pkg/models/list_test.go
+++ b/pkg/models/list_test.go
@@ -130,29 +130,28 @@ func TestList_Delete(t *testing.T) {
 }
 
 func TestList_ReadAll(t *testing.T) {
-	initFixtures(t)
-	// Create test database
-	//assert.NoError(t, LoadFixtures())
+	t.Run("all in namespace", func(t *testing.T) {
+		initFixtures(t)
+		// Get all lists for our namespace
+		lists, err := GetListsByNamespaceID(1, &User{})
+		assert.NoError(t, err)
+		assert.Equal(t, len(lists), 2)
+	})
+	t.Run("all lists for user", func(t *testing.T) {
+		u := &User{ID: 1}
+		list := List{}
+		lists3, _, _, err := list.ReadAll(u, "", 1, 50)
 
-	// Get all lists for our namespace
-	lists, err := GetListsByNamespaceID(1, &User{})
-	assert.NoError(t, err)
-	assert.Equal(t, len(lists), 2)
-
-	// Get all lists our user has access to
-	u, err := GetUserByID(1)
-	assert.NoError(t, err)
-
-	lists2 := List{}
-	lists3, _, _, err := lists2.ReadAll(u, "", 1, 50)
-
-	assert.NoError(t, err)
-	assert.Equal(t, reflect.TypeOf(lists3).Kind(), reflect.Slice)
-	s := reflect.ValueOf(lists3)
-	assert.Equal(t, 16, s.Len())
-
-	// Try getting lists for a nonexistant user
-	_, _, _, err = lists2.ReadAll(&User{ID: 984234}, "", 1, 50)
-	assert.Error(t, err)
-	assert.True(t, IsErrUserDoesNotExist(err))
+		assert.NoError(t, err)
+		assert.Equal(t, reflect.TypeOf(lists3).Kind(), reflect.Slice)
+		s := reflect.ValueOf(lists3)
+		assert.Equal(t, 16, s.Len())
+	})
+	t.Run("lists for nonexistant user", func(t *testing.T) {
+		user := &User{ID: 999999}
+		list := List{}
+		_, _, _, err := list.ReadAll(user, "", 1, 50)
+		assert.Error(t, err)
+		assert.True(t, IsErrUserDoesNotExist(err))
+	})
 }