Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 23:56:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: add test with changing address order

Browse Source
This commit is contained in:
James Houlahan
2020-05-06 09:57:34 +02:00
parent c61e8bdc71
commit 2d200f6f8c
19 changed files with 202 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/liveapi/cleanup.go
View File

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
)
func cleanup(client pmapi.Client) error {
func cleanup(client pmapi.Client, addresses *pmapi.AddressList) error {
if err := cleanSystemFolders(client); err != nil {
return errors.Wrap(err, "failed to clean system folders")
}
@ -34,6 +34,9 @@ func cleanup(client pmapi.Client) error {
if err := cleanTrash(client); err != nil {
return errors.Wrap(err, "failed to clean trash")
}
if err := reorderAddresses(client, addresses); err != nil {
return errors.Wrap(err, "failed to clean trash")
}
return nil
}
@ -130,3 +133,13 @@ func emptyFolder(client pmapi.Client, labelID string) error {
}
return nil
}
func reorderAddresses(client pmapi.Client, addresses *pmapi.AddressList) error {
addressIDs := []string{}
for _, address := range *addresses {
addressIDs = append(addressIDs, address.ID)
}
return client.ReorderAddresses(addressIDs)
}

8
test/liveapi/users.go
View File

@ -50,7 +50,7 @@ func (ctl *Controller) AddUser(user *pmapi.User, addresses *pmapi.AddressList, p
return errors.Wrap(err, "failed to unlock addresses")
}
if err := cleanup(client); err != nil {
if err := cleanup(client, addresses); err != nil {
return errors.Wrap(err, "failed to clean user")
}
@ -58,3 +58,9 @@ func (ctl *Controller) AddUser(user *pmapi.User, addresses *pmapi.AddressList, p
return nil
}
func (ctl *Controller) ReorderAddresses(user *pmapi.User, addressIDs []string) error {
client := ctl.clientManager.GetClient(user.ID)
return client.ReorderAddresses(addressIDs)
}