Merge pull request #9 from Bunchhieng/master

Only allow to open web app if .todos.json exists in current directory

1 files changed, 12 insertions, 6 deletions

diff --git a/todolist/todo_list_test.go b/todolist/todo_list_test.go
index 941106d..8a40b14 100644
--- a/todolist/todo_list_test.go
+++ b/todolist/todo_list_test.go
@@ -17,7 +17,8 @@ func TestIndexOf(t *testing.T) {
 	todo := &Todo{Subject: "Grant"}
 	store := &FileStore{FileLocation: "todos.json"}
 	list := &TodoList{}
-	list.Load(store.Load())
+	todos, _ := store.Load()
+	list.Load(todos)
 
 	assert.Equal(-1, list.IndexOf(todo))
 	assert.Equal(0, list.IndexOf(list.Data[0]))
@@ -27,7 +28,8 @@ func TestDelete(t *testing.T) {
 	assert := assert.New(t)
 	store := &FileStore{FileLocation: "todos.json"}
 	list := &TodoList{}
-	list.Load(store.Load())
+	todos, _ := store.Load()
+	list.Load(todos)
 	assert.Equal(2, len(list.Data))
 	list.Delete(1)
 	assert.Equal(1, len(list.Data))
@@ -37,7 +39,8 @@ func TestComplete(t *testing.T) {
 	assert := assert.New(t)
 	store := &FileStore{FileLocation: "todos.json"}
 	list := &TodoList{}
-	list.Load(store.Load())
+	todos, _ := store.Load()
+	list.Load(todos)
 	assert.Equal(false, list.FindById(1).Completed)
 	list.Complete(1)
 	assert.Equal(true, list.FindById(1).Completed)
@@ -47,7 +50,8 @@ func TestArchive(t *testing.T) {
 	assert := assert.New(t)
 	store := &FileStore{FileLocation: "todos.json"}
 	list := &TodoList{}
-	list.Load(store.Load())
+	todos, _ := store.Load()
+	list.Load(todos)
 	assert.Equal(false, list.FindById(2).Archived)
 	list.Archive(2)
 	assert.Equal(true, list.FindById(2).Archived)
@@ -56,7 +60,8 @@ func TestUnarchive(t *testing.T) {
 	assert := assert.New(t)
 	store := &FileStore{FileLocation: "todos.json"}
 	list := &TodoList{}
-	list.Load(store.Load())
+	todos, _ := store.Load()
+	list.Load(todos)
 	assert.Equal(true, list.FindById(1).Archived)
 	list.Unarchive(1)
 	assert.Equal(false, list.FindById(1).Archived)
@@ -66,7 +71,8 @@ func TestUncomplete(t *testing.T) {
 	assert := assert.New(t)
 	store := &FileStore{FileLocation: "todos.json"}
 	list := &TodoList{}
-	list.Load(store.Load())
+	todos, _ := store.Load()
+	list.Load(todos)
 	assert.Equal(true, list.FindById(2).Completed)
 	list.Uncomplete(2)
 	assert.Equal(false, list.FindById(2).Completed)