doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(clients): fix incorrect client naming

Browse source
This commit is contained in:
hexxa 2022-08-06 10:01:28 +08:00 • committed by Hexxa
parent f0293fbc4c
commit 48b0ff2df0
14 changed files with 106 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/server_concurrency_test.go
View file

@ -48,7 +48,7 @@ func TestConcurrency(t *testing.T) {
t.Fatal("fail to start server")
}
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(adminName, adminPwd)
if len(errs) > 0 {
t.Fatal(errs)
@ -67,7 +67,7 @@ func TestConcurrency(t *testing.T) {
filesCount := 10
mockClient := func(name, pwd string, wg *sync.WaitGroup) {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(name, pwd)
if len(errs) > 0 {
t.Fatal(errs)

17
src/server/server_files_test.go
View file

@ -62,7 +62,7 @@ func TestFileHandlers(t *testing.T) {
t.Fatal("fail to start server")
}
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(adminName, adminPwd)
if len(errs) > 0 {
t.Fatal(errs)
@ -405,7 +405,7 @@ func TestFileHandlers(t *testing.T) {
}
}
userUsersCl := client.NewSingleUserClient(addr)
userUsersCl := client.NewUsersClient(addr)
resp, _, errs := userUsersCl.Login("demo", "Quicksh@re")
if len(errs) > 0 {
t.Fatal(errs)
@ -918,6 +918,19 @@ func TestFileHandlers(t *testing.T) {
t.Fatal("search result not match")
}
userFilesClient, err := loginFilesClient(addr, "demo", "Quicksh@re")
if err != nil {
t.Fatal(err)
}
resp, searchItemsResp, errs = userFilesClient.SearchItems(keywords)
if len(errs) > 0 {
t.Fatal(errs)
} else if resp.StatusCode != 200 {
t.Fatal(resp.StatusCode)
} else if len(searchItemsResp.Results) > 0 {
t.Fatal("shoud return empty results")
}
// delete paths
for pathname := range toDelete {
resp, _, errs := cl.Delete(pathname)

14
src/server/server_permission_test.go
View file

@ -114,7 +114,7 @@ func TestPermissions(t *testing.T) {
tmpAdmin, tmpAdminPwd := "tmpAdmin", "1234"
tmpNewRole := "tmpNewRole"
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
if requireAuth {
resp, _, errs := cl.Login(user, pwd)
@ -290,7 +290,7 @@ func TestPermissions(t *testing.T) {
// Mkdir
// Move
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
if requireAuth {
@ -381,7 +381,7 @@ func TestPermissions(t *testing.T) {
})
uploadSample := func() {
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
resp, _, errs := cl.Login("user2", "1234")
@ -411,7 +411,7 @@ func TestPermissions(t *testing.T) {
// GenerateHash
// Search
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
if requireAuth {
resp, _, errs := cl.Login(user, pwd)
@ -575,7 +575,7 @@ func TestPermissions(t *testing.T) {
// sharing permission tests
enableSharing := func() {
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
resp, _, errs := cl.Login("share", "1234")
@ -631,7 +631,7 @@ func TestPermissions(t *testing.T) {
// ListSharingIDs
// GetSharingDir
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
homePath := "/"
desc := user
@ -727,7 +727,7 @@ func TestPermissions(t *testing.T) {
// SetClientCfg
// ReportErrors
cl := client.NewSingleUserClient(addr)
cl := client.NewUsersClient(addr)
token := &http.Cookie{}
desc := user
errReports := &settings.ClientErrorReports{

2
src/server/server_settings_test.go
View file

@ -62,7 +62,7 @@ func TestSettingsHandlers(t *testing.T) {
t.Fatal("fail to start server")
}
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(adminName, adminPwd)
if len(errs) > 0 {
t.Fatal(errs)

6
src/server/server_space_limit_test.go
View file

@ -63,7 +63,7 @@ func TestSpaceLimit(t *testing.T) {
t.Fatal("fail to start server")
}
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(adminName, adminPwd)
if len(errs) > 0 {
t.Fatal(errs)
@ -100,7 +100,7 @@ func TestSpaceLimit(t *testing.T) {
}
t.Run("test space limiting: Upload", func(t *testing.T) {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(getUserName(0), userPwd)
if len(errs) > 0 {
t.Fatal(errs)
@ -230,7 +230,7 @@ func TestSpaceLimit(t *testing.T) {
})
t.Run("ResetUsedSpace", func(t *testing.T) {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login("test", "test")
if len(errs) > 0 {
t.Fatal(errs)

8
src/server/server_users_test.go
View file

@ -72,7 +72,7 @@ func TestUsersHandlers(t *testing.T) {
defer srv.Shutdown()
fs := srv.depsFS()
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
settingsCl := client.NewSettingsClient(addr)
if !isServerReady(addr) {
@ -82,7 +82,7 @@ func TestUsersHandlers(t *testing.T) {
var err error
t.Run("test inited users", func(t *testing.T) {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(adminName, adminPwd)
if len(errs) > 0 {
t.Fatal(errs)
@ -164,7 +164,7 @@ func TestUsersHandlers(t *testing.T) {
}
for _, user := range users {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(user.Name, user.Pwd)
if len(errs) > 0 {
t.Fatal(errs)
@ -451,7 +451,7 @@ func TestUsersHandlers(t *testing.T) {
})
t.Run("Login, SetPreferences, Self, Logout", func(t *testing.T) {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(adminName, adminNewPwd)
if len(errs) > 0 {
t.Fatal(errs)

26
src/server/test_helpers.go
View file

@ -2,6 +2,7 @@ package server
import (
"encoding/base64"
"errors"
"fmt"
"io/ioutil"
"math/rand"
@ -16,6 +17,7 @@ import (
"github.com/ihexxa/quickshare/src/client"
"github.com/ihexxa/quickshare/src/db"
fspkg "github.com/ihexxa/quickshare/src/fs"
q "github.com/ihexxa/quickshare/src/handlers"
)
func startTestServer(config string) *Server {
@ -57,7 +59,7 @@ func getUserName(id int) string {
}
func addUsers(t *testing.T, addr, userPwd string, userCount int, adminToken *http.Cookie) map[string]string {
usersCl := client.NewSingleUserClient(addr)
usersCl := client.NewUsersClient(addr)
users := map[string]string{}
for i := range make([]int, userCount) {
userName := getUserName(i)
@ -220,3 +222,25 @@ func assertResp(t *testing.T, resp *http.Response, errs []error, expectedCode in
t.Fatal(desc, resp.StatusCode, expectedCode)
}
}
func joinErrs(errs []error) error {
msgs := []string{}
for _, err := range errs {
msgs = append(msgs, err.Error())
}
return errors.New(strings.Join(msgs, ","))
}
func loginFilesClient(addr, user, pwd string) (*client.FilesClient, error) {
usersCl := client.NewUsersClient(addr)
resp, _, errs := usersCl.Login(user, pwd)
if len(errs) > 0 {
return nil, joinErrs(errs)
} else if resp.StatusCode != 200 {
return nil, fmt.Errorf("unexpected code(%d)", resp.StatusCode)
}
token := client.GetCookie(resp.Cookies(), q.TokenCookie)
return client.NewFilesClient(addr, token), nil
}

BIN
src/server/testdata/test_quickshare.db vendored
View file

Binary file not shown.