Browse Source

fix tests

afeiszli 4 years ago
parent
commit
67e2eebb7d
1 changed files with 8 additions and 8 deletions
  1. 8 8
      controllers/userHttpController_test.go

+ 8 - 8
controllers/userHttpController_test.go

@@ -42,7 +42,7 @@ func TestMain(m *testing.M) {
 func TestHasAdmin(t *testing.T) {
 func TestHasAdmin(t *testing.T) {
 	_, err := DeleteUser("admin")
 	_, err := DeleteUser("admin")
 	assert.Nil(t, err)
 	assert.Nil(t, err)
-	user := models.User{"admin", "password", true}
+	user := models.User{"admin", "password", nil, true}
 	_, err = CreateUser(user)
 	_, err = CreateUser(user)
 	assert.Nil(t, err)
 	assert.Nil(t, err)
 	t.Run("AdminExists", func(t *testing.T) {
 	t.Run("AdminExists", func(t *testing.T) {
@@ -60,7 +60,7 @@ func TestHasAdmin(t *testing.T) {
 }
 }
 
 
 func TestCreateUser(t *testing.T) {
 func TestCreateUser(t *testing.T) {
-	user := models.User{"admin", "password", true}
+	user := models.User{"admin", "password", nil, true}
 	t.Run("NoUser", func(t *testing.T) {
 	t.Run("NoUser", func(t *testing.T) {
 		_, err := DeleteUser("admin")
 		_, err := DeleteUser("admin")
 		assert.Nil(t, err)
 		assert.Nil(t, err)
@@ -79,7 +79,7 @@ func TestDeleteUser(t *testing.T) {
 	hasadmin, err := HasAdmin()
 	hasadmin, err := HasAdmin()
 	assert.Nil(t, err)
 	assert.Nil(t, err)
 	if !hasadmin {
 	if !hasadmin {
-		user := models.User{"admin", "pasword", true}
+		user := models.User{"admin", "pasword", nil, true}
 		_, err := CreateUser(user)
 		_, err := CreateUser(user)
 		assert.Nil(t, err)
 		assert.Nil(t, err)
 	}
 	}
@@ -138,7 +138,7 @@ func TestValidateUser(t *testing.T) {
 
 
 func TestGetUser(t *testing.T) {
 func TestGetUser(t *testing.T) {
 	t.Run("UserExisits", func(t *testing.T) {
 	t.Run("UserExisits", func(t *testing.T) {
-		user := models.User{"admin", "password", true}
+		user := models.User{"admin", "password", nil, true}
 		hasadmin, err := HasAdmin()
 		hasadmin, err := HasAdmin()
 		assert.Nil(t, err)
 		assert.Nil(t, err)
 		if !hasadmin {
 		if !hasadmin {
@@ -159,8 +159,8 @@ func TestGetUser(t *testing.T) {
 }
 }
 
 
 func TestUpdateUser(t *testing.T) {
 func TestUpdateUser(t *testing.T) {
-	user := models.User{"admin", "password", true}
-	newuser := models.User{"hello", "world", true}
+	user := models.User{"admin", "password", nil, true}
+	newuser := models.User{"hello", "world", nil, true}
 	t.Run("UserExisits", func(t *testing.T) {
 	t.Run("UserExisits", func(t *testing.T) {
 		_, err := DeleteUser("admin")
 		_, err := DeleteUser("admin")
 		_, err = CreateUser(user)
 		_, err = CreateUser(user)
@@ -228,7 +228,7 @@ func TestVerifyAuthRequest(t *testing.T) {
 	t.Run("Non-Admin", func(t *testing.T) {
 	t.Run("Non-Admin", func(t *testing.T) {
 		//can't create a user that is not a an admin
 		//can't create a user that is not a an admin
 		t.Skip()
 		t.Skip()
-		user := models.User{"admin", "admin", false}
+		user := models.User{"admin", "admin", nil, false}
 		_, err := CreateUser(user)
 		_, err := CreateUser(user)
 		assert.Nil(t, err)
 		assert.Nil(t, err)
 		authRequest := models.UserAuthParams{"admin", "admin"}
 		authRequest := models.UserAuthParams{"admin", "admin"}
@@ -239,7 +239,7 @@ func TestVerifyAuthRequest(t *testing.T) {
 	})
 	})
 	t.Run("WrongPassword", func(t *testing.T) {
 	t.Run("WrongPassword", func(t *testing.T) {
 		_, err := DeleteUser("admin")
 		_, err := DeleteUser("admin")
-		user := models.User{"admin", "password", true}
+		user := models.User{"admin", "password", nil, true}
 		_, err = CreateUser(user)
 		_, err = CreateUser(user)
 		assert.Nil(t, err)
 		assert.Nil(t, err)
 		authRequest := models.UserAuthParams{"admin", "badpass"}
 		authRequest := models.UserAuthParams{"admin", "badpass"}