acl
This commit is contained in:
+38
-38
@@ -15,7 +15,7 @@ func TestRename(t *testing.T) {
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
|
||||
renamed, err := service.Rename(ctx, folder.ID, "Aventure")
|
||||
renamed, err := service.Rename(ctx, owner.ID, folder.ID, "Aventure")
|
||||
if err != nil {
|
||||
t.Fatalf("Rename : %v", err)
|
||||
}
|
||||
@@ -26,19 +26,19 @@ func TestRename(t *testing.T) {
|
||||
t.Fatalf("rev = %d, attendu %d", renamed.Rev, folder.Rev+1)
|
||||
}
|
||||
|
||||
if _, err := service.Rename(ctx, folder.ID, "a/b"); !errors.Is(err, ErrInvalidName) {
|
||||
if _, err := service.Rename(ctx, owner.ID, folder.ID, "a/b"); !errors.Is(err, ErrInvalidName) {
|
||||
t.Fatalf("erreur = %v, attendu ErrInvalidName", err)
|
||||
}
|
||||
|
||||
other := mustFolder(t, service, owner, library.ID, "Drame")
|
||||
if _, err := service.Rename(ctx, other.ID, "aventure"); !errors.Is(err, ErrNameTaken) {
|
||||
if _, err := service.Rename(ctx, owner.ID, other.ID, "aventure"); !errors.Is(err, ErrNameTaken) {
|
||||
t.Fatalf("erreur = %v, attendu ErrNameTaken", err)
|
||||
}
|
||||
|
||||
if _, err := service.Trash(ctx, other.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, other.ID); err != nil {
|
||||
t.Fatalf("Trash : %v", err)
|
||||
}
|
||||
if _, err := service.Rename(ctx, other.ID, "Autre"); !errors.Is(err, ErrDocumentDeleted) {
|
||||
if _, err := service.Rename(ctx, owner.ID, other.ID, "Autre"); !errors.Is(err, ErrDocumentDeleted) {
|
||||
t.Fatalf("erreur = %v, attendu ErrDocumentDeleted", err)
|
||||
}
|
||||
}
|
||||
@@ -53,7 +53,7 @@ func TestMove(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, libraryA.ID, "Action")
|
||||
child := mustFolder(t, service, owner, folder.ID, "Extras")
|
||||
|
||||
moved, err := service.Move(ctx, folder.ID, libraryB.ID)
|
||||
moved, err := service.Move(ctx, owner.ID, folder.ID, libraryB.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Move : %v", err)
|
||||
}
|
||||
@@ -70,7 +70,7 @@ func TestMove(t *testing.T) {
|
||||
t.Fatalf("rev = %d, attendu %d", moved.Rev, folder.Rev+1)
|
||||
}
|
||||
|
||||
movedChild, err := service.Get(ctx, child.ID)
|
||||
movedChild, err := service.Get(ctx, owner.ID, child.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Get(child) : %v", err)
|
||||
}
|
||||
@@ -87,7 +87,7 @@ func TestMove(t *testing.T) {
|
||||
t.Fatalf("rev enfant = %d, attendu %d", movedChild.Rev, child.Rev+1)
|
||||
}
|
||||
|
||||
children, err := service.ListChildren(ctx, libraryB.ID)
|
||||
children, err := service.ListChildren(ctx, owner.ID, libraryB.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("ListChildren : %v", err)
|
||||
}
|
||||
@@ -103,7 +103,7 @@ func TestMoveRootRejected(t *testing.T) {
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
other := mustLibrary(t, service, owner, "Films")
|
||||
|
||||
_, err := service.Move(ctx, library.ID, other.ID)
|
||||
_, err := service.Move(ctx, owner.ID, library.ID, other.ID)
|
||||
if !errors.Is(err, ErrCannotMoveRoot) {
|
||||
t.Fatalf("erreur = %v, attendu ErrCannotMoveRoot", err)
|
||||
}
|
||||
@@ -117,7 +117,7 @@ func TestMoveIntoDescendantRejected(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
child := mustFolder(t, service, owner, folder.ID, "Extras")
|
||||
|
||||
_, err := service.Move(ctx, folder.ID, child.ID)
|
||||
_, err := service.Move(ctx, owner.ID, folder.ID, child.ID)
|
||||
if !errors.Is(err, ErrInvalidMove) {
|
||||
t.Fatalf("erreur = %v, attendu ErrInvalidMove", err)
|
||||
}
|
||||
@@ -130,7 +130,7 @@ func TestMoveIntoItselfRejected(t *testing.T) {
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
|
||||
_, err := service.Move(ctx, folder.ID, folder.ID)
|
||||
_, err := service.Move(ctx, owner.ID, folder.ID, folder.ID)
|
||||
if !errors.Is(err, ErrInvalidMove) {
|
||||
t.Fatalf("erreur = %v, attendu ErrInvalidMove", err)
|
||||
}
|
||||
@@ -144,7 +144,7 @@ func TestMoveToInvalidParentRejected(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
movie := mustKindDocument(t, service, owner, library, "movie", "Film")
|
||||
|
||||
_, err := service.Move(ctx, folder.ID, movie.ID)
|
||||
_, err := service.Move(ctx, owner.ID, folder.ID, movie.ID)
|
||||
if !errors.Is(err, ErrInvalidParent) {
|
||||
t.Fatalf("erreur = %v, attendu ErrInvalidParent", err)
|
||||
}
|
||||
@@ -157,7 +157,7 @@ func TestMoveToSameParentIsNoop(t *testing.T) {
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
|
||||
moved, err := service.Move(ctx, folder.ID, library.ID)
|
||||
moved, err := service.Move(ctx, owner.ID, folder.ID, library.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Move : %v", err)
|
||||
}
|
||||
@@ -175,7 +175,7 @@ func TestMoveDuplicateNameRejected(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, libraryA.ID, "Action")
|
||||
mustFolder(t, service, owner, libraryB.ID, "action")
|
||||
|
||||
_, err := service.Move(ctx, folder.ID, libraryB.ID)
|
||||
_, err := service.Move(ctx, owner.ID, folder.ID, libraryB.ID)
|
||||
if !errors.Is(err, ErrNameTaken) {
|
||||
t.Fatalf("erreur = %v, attendu ErrNameTaken", err)
|
||||
}
|
||||
@@ -189,11 +189,11 @@ func TestMoveRejectsDeletedDocument(t *testing.T) {
|
||||
libraryB := mustLibrary(t, service, owner, "Films")
|
||||
folder := mustFolder(t, service, owner, libraryA.ID, "Action")
|
||||
|
||||
if _, err := service.Trash(ctx, folder.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, folder.ID); err != nil {
|
||||
t.Fatalf("Trash : %v", err)
|
||||
}
|
||||
|
||||
_, err := service.Move(ctx, folder.ID, libraryB.ID)
|
||||
_, err := service.Move(ctx, owner.ID, folder.ID, libraryB.ID)
|
||||
if !errors.Is(err, ErrDocumentDeleted) {
|
||||
t.Fatalf("erreur = %v, attendu ErrDocumentDeleted", err)
|
||||
}
|
||||
@@ -207,11 +207,11 @@ func TestMoveRejectsDeletedParent(t *testing.T) {
|
||||
libraryB := mustLibrary(t, service, owner, "Films")
|
||||
folder := mustFolder(t, service, owner, libraryA.ID, "Action")
|
||||
|
||||
if _, err := service.Trash(ctx, libraryB.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, libraryB.ID); err != nil {
|
||||
t.Fatalf("Trash : %v", err)
|
||||
}
|
||||
|
||||
_, err := service.Move(ctx, folder.ID, libraryB.ID)
|
||||
_, err := service.Move(ctx, owner.ID, folder.ID, libraryB.ID)
|
||||
if !errors.Is(err, ErrParentDeleted) {
|
||||
t.Fatalf("erreur = %v, attendu ErrParentDeleted", err)
|
||||
}
|
||||
@@ -225,7 +225,7 @@ func TestTrashAndRestore(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
child := mustFolder(t, service, owner, folder.ID, "Extras")
|
||||
|
||||
trashed, err := service.Trash(ctx, folder.ID, owner.ID)
|
||||
trashed, err := service.Trash(ctx, owner.ID, folder.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Trash : %v", err)
|
||||
}
|
||||
@@ -239,7 +239,7 @@ func TestTrashAndRestore(t *testing.T) {
|
||||
t.Fatal("trash_batch non renseigné")
|
||||
}
|
||||
|
||||
trashedChild, err := service.Get(ctx, child.ID)
|
||||
trashedChild, err := service.Get(ctx, owner.ID, child.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Get(child) : %v", err)
|
||||
}
|
||||
@@ -250,7 +250,7 @@ func TestTrashAndRestore(t *testing.T) {
|
||||
t.Fatal("l’enfant n’appartient pas au même lot de corbeille")
|
||||
}
|
||||
|
||||
children, err := service.ListChildren(ctx, library.ID)
|
||||
children, err := service.ListChildren(ctx, owner.ID, library.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("ListChildren : %v", err)
|
||||
}
|
||||
@@ -258,7 +258,7 @@ func TestTrashAndRestore(t *testing.T) {
|
||||
t.Fatalf("enfants = %d, attendu 0", len(children))
|
||||
}
|
||||
|
||||
restored, err := service.Restore(ctx, folder.ID)
|
||||
restored, err := service.Restore(ctx, owner.ID, folder.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Restore : %v", err)
|
||||
}
|
||||
@@ -266,7 +266,7 @@ func TestTrashAndRestore(t *testing.T) {
|
||||
t.Fatalf("document restauré avec des champs de corbeille : %+v", restored)
|
||||
}
|
||||
|
||||
restoredChild, err := service.Get(ctx, child.ID)
|
||||
restoredChild, err := service.Get(ctx, owner.ID, child.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Get(child restauré) : %v", err)
|
||||
}
|
||||
@@ -274,7 +274,7 @@ func TestTrashAndRestore(t *testing.T) {
|
||||
t.Fatal("enfant non restauré")
|
||||
}
|
||||
|
||||
children, err = service.ListChildren(ctx, library.ID)
|
||||
children, err = service.ListChildren(ctx, owner.ID, library.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("ListChildren après restauration : %v", err)
|
||||
}
|
||||
@@ -289,7 +289,7 @@ func TestRestoreNonDeletedIsNoop(t *testing.T) {
|
||||
owner := mustUser(t, service, "owner")
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
|
||||
restored, err := service.Restore(ctx, library.ID)
|
||||
restored, err := service.Restore(ctx, owner.ID, library.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Restore : %v", err)
|
||||
}
|
||||
@@ -304,11 +304,11 @@ func TestTrashAlreadyDeleted(t *testing.T) {
|
||||
owner := mustUser(t, service, "owner")
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
|
||||
if _, err := service.Trash(ctx, library.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, library.ID); err != nil {
|
||||
t.Fatalf("Trash : %v", err)
|
||||
}
|
||||
|
||||
if _, err := service.Trash(ctx, library.ID, owner.ID); !errors.Is(err, ErrDocumentDeleted) {
|
||||
if _, err := service.Trash(ctx, owner.ID, library.ID); !errors.Is(err, ErrDocumentDeleted) {
|
||||
t.Fatalf("erreur = %v, attendu ErrDocumentDeleted", err)
|
||||
}
|
||||
}
|
||||
@@ -320,13 +320,13 @@ func TestRestoreConflict(t *testing.T) {
|
||||
library := mustLibrary(t, service, owner, "Photos")
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
|
||||
if _, err := service.Trash(ctx, folder.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, folder.ID); err != nil {
|
||||
t.Fatalf("Trash : %v", err)
|
||||
}
|
||||
|
||||
mustFolder(t, service, owner, library.ID, "Action")
|
||||
|
||||
if _, err := service.Restore(ctx, folder.ID); !errors.Is(err, ErrNameTaken) {
|
||||
if _, err := service.Restore(ctx, owner.ID, folder.ID); !errors.Is(err, ErrNameTaken) {
|
||||
t.Fatalf("erreur = %v, attendu ErrNameTaken", err)
|
||||
}
|
||||
}
|
||||
@@ -339,14 +339,14 @@ func TestRestoreParentDeletedInDifferentBatch(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
child := mustFolder(t, service, owner, folder.ID, "Extras")
|
||||
|
||||
if _, err := service.Trash(ctx, child.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, child.ID); err != nil {
|
||||
t.Fatalf("Trash(child) : %v", err)
|
||||
}
|
||||
if _, err := service.Trash(ctx, folder.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, folder.ID); err != nil {
|
||||
t.Fatalf("Trash(folder) : %v", err)
|
||||
}
|
||||
|
||||
if _, err := service.Restore(ctx, child.ID); !errors.Is(err, ErrParentDeleted) {
|
||||
if _, err := service.Restore(ctx, owner.ID, child.ID); !errors.Is(err, ErrParentDeleted) {
|
||||
t.Fatalf("erreur = %v, attendu ErrParentDeleted", err)
|
||||
}
|
||||
}
|
||||
@@ -359,14 +359,14 @@ func TestRestoreRejectsDeletedAncestor(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, library.ID, "Action")
|
||||
child := mustFolder(t, service, owner, folder.ID, "Extras")
|
||||
|
||||
if _, err := service.Trash(ctx, folder.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, folder.ID); err != nil {
|
||||
t.Fatalf("Trash(folder) : %v", err)
|
||||
}
|
||||
if _, err := service.Trash(ctx, library.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, library.ID); err != nil {
|
||||
t.Fatalf("Trash(library) : %v", err)
|
||||
}
|
||||
|
||||
if _, err := service.Restore(ctx, child.ID); !errors.Is(err, ErrParentDeleted) {
|
||||
if _, err := service.Restore(ctx, owner.ID, child.ID); !errors.Is(err, ErrParentDeleted) {
|
||||
t.Fatalf("erreur = %v, attendu ErrParentDeleted", err)
|
||||
}
|
||||
}
|
||||
@@ -380,16 +380,16 @@ func TestMoveUpdatesTrashedDescendants(t *testing.T) {
|
||||
folder := mustFolder(t, service, owner, libraryA.ID, "Action")
|
||||
child := mustFolder(t, service, owner, folder.ID, "Extras")
|
||||
|
||||
if _, err := service.Trash(ctx, child.ID, owner.ID); err != nil {
|
||||
if _, err := service.Trash(ctx, owner.ID, child.ID); err != nil {
|
||||
t.Fatalf("Trash(child) : %v", err)
|
||||
}
|
||||
|
||||
moved, err := service.Move(ctx, folder.ID, libraryB.ID)
|
||||
moved, err := service.Move(ctx, owner.ID, folder.ID, libraryB.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Move : %v", err)
|
||||
}
|
||||
|
||||
restored, err := service.Restore(ctx, child.ID)
|
||||
restored, err := service.Restore(ctx, owner.ID, child.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("Restore(child) : %v", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user