Skip to content

Commit 440f921

Browse files
committed
fixed "share create" tests
Signed-off-by: Alexander Piskun <[email protected]>
1 parent c20b60b commit 440f921

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

tests/actual_tests/files_sharing_test.py

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,13 @@ async def test_share_fields_async(anc_any):
8383
def test_create_permissions(nc_any):
8484
new_share = nc_any.files.sharing.create("test_empty_dir", ShareType.TYPE_LINK, FilePermissions.PERMISSION_CREATE)
8585
nc_any.files.sharing.delete(new_share)
86-
# starting from Nextcloud 30 permissions are: FilePermissions.PERMISSION_CREATE | FilePermissions.PERMISSION_SHARE
87-
# https://github.com/nextcloud/server/commit/0bde47a39256dfad3baa8d3ffa275ac3d113a9d5#diff-dbbe017dd357504abc442a6f1d0305166520ebf80353f42814b3f879a3e241bc
88-
assert (
89-
new_share.permissions
90-
== FilePermissions.PERMISSION_READ | FilePermissions.PERMISSION_CREATE | FilePermissions.PERMISSION_SHARE
91-
or new_share.permissions == FilePermissions.PERMISSION_CREATE | FilePermissions.PERMISSION_SHARE
92-
)
86+
assert (new_share.permissions & FilePermissions.PERMISSION_CREATE) == FilePermissions.PERMISSION_CREATE
9387
new_share = nc_any.files.sharing.create("test_empty_dir", ShareType.TYPE_LINK, FilePermissions.PERMISSION_DELETE)
9488
nc_any.files.sharing.delete(new_share)
95-
assert (
96-
new_share.permissions
97-
== FilePermissions.PERMISSION_READ | FilePermissions.PERMISSION_DELETE | FilePermissions.PERMISSION_SHARE
98-
)
89+
assert (new_share.permissions & FilePermissions.PERMISSION_DELETE) == FilePermissions.PERMISSION_DELETE
9990
new_share = nc_any.files.sharing.create("test_empty_dir", ShareType.TYPE_LINK, FilePermissions.PERMISSION_UPDATE)
10091
nc_any.files.sharing.delete(new_share)
101-
assert (
102-
new_share.permissions
103-
== FilePermissions.PERMISSION_READ | FilePermissions.PERMISSION_UPDATE | FilePermissions.PERMISSION_SHARE
104-
)
92+
assert (new_share.permissions & FilePermissions.PERMISSION_UPDATE) == FilePermissions.PERMISSION_UPDATE
10593

10694

10795
@pytest.mark.asyncio(scope="session")
@@ -110,29 +98,17 @@ async def test_create_permissions_async(anc_any):
11098
"test_empty_dir", ShareType.TYPE_LINK, FilePermissions.PERMISSION_CREATE
11199
)
112100
await anc_any.files.sharing.delete(new_share)
113-
# starting from Nextcloud 30 permissions are: FilePermissions.PERMISSION_CREATE | FilePermissions.PERMISSION_SHARE
114-
# https://github.com/nextcloud/server/commit/0bde47a39256dfad3baa8d3ffa275ac3d113a9d5#diff-dbbe017dd357504abc442a6f1d0305166520ebf80353f42814b3f879a3e241bc
115-
assert (
116-
new_share.permissions
117-
== FilePermissions.PERMISSION_READ | FilePermissions.PERMISSION_CREATE | FilePermissions.PERMISSION_SHARE
118-
or new_share.permissions == FilePermissions.PERMISSION_CREATE | FilePermissions.PERMISSION_SHARE
119-
)
101+
assert (new_share.permissions & FilePermissions.PERMISSION_CREATE) == FilePermissions.PERMISSION_CREATE
120102
new_share = await anc_any.files.sharing.create(
121103
"test_empty_dir", ShareType.TYPE_LINK, FilePermissions.PERMISSION_DELETE
122104
)
123105
await anc_any.files.sharing.delete(new_share)
124-
assert (
125-
new_share.permissions
126-
== FilePermissions.PERMISSION_READ | FilePermissions.PERMISSION_DELETE | FilePermissions.PERMISSION_SHARE
127-
)
106+
assert (new_share.permissions & FilePermissions.PERMISSION_DELETE) == FilePermissions.PERMISSION_DELETE
128107
new_share = await anc_any.files.sharing.create(
129108
"test_empty_dir", ShareType.TYPE_LINK, FilePermissions.PERMISSION_UPDATE
130109
)
131110
await anc_any.files.sharing.delete(new_share)
132-
assert (
133-
new_share.permissions
134-
== FilePermissions.PERMISSION_READ | FilePermissions.PERMISSION_UPDATE | FilePermissions.PERMISSION_SHARE
135-
)
111+
assert (new_share.permissions & FilePermissions.PERMISSION_UPDATE) == FilePermissions.PERMISSION_UPDATE
136112

137113

138114
def test_create_public_upload(nc_any):

0 commit comments

Comments
 (0)