chore: update server tests (#2118)

test/server/auth_test.go

@@ -21,12 +21,24 @@ func TestAuthServer(t *testing.T) {
 		Username: "testuser",
 		Password: "testpassword",
 	}
-	user, err := s.postAuthSignup(signup)
+	user, err := s.postAuthSignUp(signup)
 	require.NoError(t, err)
 	require.Equal(t, signup.Username, user.Username)
+
+	signin := &apiv1.SignIn{
+		Username: "testuser",
+		Password: "testpassword",
+	}
+	user, err = s.postAuthSignIn(signin)
+	require.NoError(t, err)
+	require.Equal(t, signup.Username, user.Username)
+	err = s.postSignOut()
+	require.NoError(t, err)
+	_, err = s.getCurrentUser()
+	require.Error(t, err)
 }
 
-func (s *TestingServer) postAuthSignup(signup *apiv1.SignUp) (*apiv1.User, error) {
+func (s *TestingServer) postAuthSignUp(signup *apiv1.SignUp) (*apiv1.User, error) {
 	rawData, err := json.Marshal(&signup)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to marshal signup")
@@ -49,3 +61,35 @@ func (s *TestingServer) postAuthSignup(signup *apiv1.SignUp) (*apiv1.User, error
 	}
 	return user, nil
 }
+
+func (s *TestingServer) postAuthSignIn(signip *apiv1.SignIn) (*apiv1.User, error) {
+	rawData, err := json.Marshal(&signip)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to marshal signin")
+	}
+	reader := bytes.NewReader(rawData)
+	body, err := s.post("/api/v1/auth/signin", reader, nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "fail to post request")
+	}
+
+	buf := &bytes.Buffer{}
+	_, err = buf.ReadFrom(body)
+	if err != nil {
+		return nil, errors.Wrap(err, "fail to read response body")
+	}
+
+	user := &apiv1.User{}
+	if err = json.Unmarshal(buf.Bytes(), user); err != nil {
+		return nil, errors.Wrap(err, "fail to unmarshal post signin response")
+	}
+	return user, nil
+}
+
+func (s *TestingServer) postSignOut() error {
+	_, err := s.post("/api/v1/auth/signout", nil, nil)
+	if err != nil {
+		return errors.Wrap(err, "fail to post request")
+	}
+	return nil
+}

test/server/memo_relation_test.go

@@ -22,7 +22,7 @@ func TestMemoRelationServer(t *testing.T) {
 		Username: "testuser",
 		Password: "testpassword",
 	}
-	user, err := s.postAuthSignup(signup)
+	user, err := s.postAuthSignUp(signup)
 	require.NoError(t, err)
 	require.Equal(t, signup.Username, user.Username)
 	memo, err := s.postMemoCreate(&apiv1.CreateMemoRequest{

test/server/memo_test.go

@@ -22,7 +22,7 @@ func TestMemoServer(t *testing.T) {
 		Username: "testuser",
 		Password: "testpassword",
 	}
-	user, err := s.postAuthSignup(signup)
+	user, err := s.postAuthSignUp(signup)
 	require.NoError(t, err)
 	require.Equal(t, signup.Username, user.Username)
 	memo, err := s.postMemoCreate(&apiv1.CreateMemoRequest{

test/server/server.go

@@ -142,7 +142,7 @@ func (s *TestingServer) request(method, uri string, body io.Reader, params, head
 				return nil, errors.Errorf("unable to find access token in the login response headers")
 			}
 			s.cookie = cookie
-		} else if strings.Contains(uri, "/api/v1/auth/logout") {
+		} else if strings.Contains(uri, "/api/v1/auth/signout") {
 			s.cookie = ""
 		}
 	}

test/server/system_test.go

@@ -25,15 +25,24 @@ func TestSystemServer(t *testing.T) {
 		Username: "testuser",
 		Password: "testpassword",
 	}
-	user, err := s.postAuthSignup(signup)
+	user, err := s.postAuthSignUp(signup)
 	require.NoError(t, err)
 	require.Equal(t, signup.Username, user.Username)
-
+	err = s.pingSystem()
+	require.NoError(t, err)
 	status, err = s.getSystemStatus()
 	require.NoError(t, err)
 	require.Equal(t, user.ID, status.Host.ID)
 }
 
+func (s *TestingServer) pingSystem() error {
+	_, err := s.get("/api/v1/ping", nil)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (s *TestingServer) getSystemStatus() (*apiv1.SystemStatus, error) {
 	body, err := s.get("/api/v1/status", nil)
 	if err != nil {

test/server/user_test.go

@@ -0,0 +1,103 @@
+package testserver
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/require"
+	apiv1 "github.com/usememos/memos/api/v1"
+)
+
+func TestUserServer(t *testing.T) {
+	ctx := context.Background()
+	s, err := NewTestingServer(ctx, t)
+	require.NoError(t, err)
+	defer s.Shutdown(ctx)
+
+	signup := &apiv1.SignUp{
+		Username: "testuser",
+		Password: "testpassword",
+	}
+	user, err := s.postAuthSignUp(signup)
+	require.NoError(t, err)
+	require.Equal(t, signup.Username, user.Username)
+	user, err = s.getCurrentUser()
+	require.NoError(t, err)
+	require.Equal(t, signup.Username, user.Username)
+	user, err = s.getUserByID(user.ID)
+	require.NoError(t, err)
+	require.Equal(t, signup.Username, user.Username)
+	newEmail := "test@usermemos.com"
+	userPatch := &apiv1.UpdateUserRequest{
+		Email: &newEmail,
+	}
+	user, err = s.patchUser(user.ID, userPatch)
+	require.NoError(t, err)
+	require.Equal(t, newEmail, user.Email)
+}
+
+func (s *TestingServer) getCurrentUser() (*apiv1.User, error) {
+	body, err := s.get("/api/v1/user/me", nil)
+	if err != nil {
+		return nil, err
+	}
+
+	buf := &bytes.Buffer{}
+	_, err = buf.ReadFrom(body)
+	if err != nil {
+		return nil, errors.Wrap(err, "fail to read response body")
+	}
+
+	user := &apiv1.User{}
+	if err = json.Unmarshal(buf.Bytes(), &user); err != nil {
+		return nil, errors.Wrap(err, "fail to unmarshal get user response")
+	}
+	return user, nil
+}
+
+func (s *TestingServer) getUserByID(userID int32) (*apiv1.User, error) {
+	body, err := s.get(fmt.Sprintf("/api/v1/user/%d", userID), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	buf := &bytes.Buffer{}
+	_, err = buf.ReadFrom(body)
+	if err != nil {
+		return nil, errors.Wrap(err, "fail to read response body")
+	}
+
+	user := &apiv1.User{}
+	if err = json.Unmarshal(buf.Bytes(), &user); err != nil {
+		return nil, errors.Wrap(err, "fail to unmarshal get user response")
+	}
+	return user, nil
+}
+
+func (s *TestingServer) patchUser(userID int32, request *apiv1.UpdateUserRequest) (*apiv1.User, error) {
+	rawData, err := json.Marshal(&request)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to marshal request")
+	}
+	reader := bytes.NewReader(rawData)
+	body, err := s.patch(fmt.Sprintf("/api/v1/user/%d", userID), reader, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	buf := &bytes.Buffer{}
+	_, err = buf.ReadFrom(body)
+	if err != nil {
+		return nil, errors.Wrap(err, "fail to read response body")
+	}
+
+	user := &apiv1.User{}
+	if err = json.Unmarshal(buf.Bytes(), user); err != nil {
+		return nil, errors.Wrap(err, "fail to unmarshal patch user response")
+	}
+	return user, nil
+}