@@ -83,25 +83,21 @@ async def test_share_fields_async(anc_any):
8383def 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
86+ assert (new_share .permissions & FilePermissions .PERMISSION_CREATE ) == FilePermissions .PERMISSION_CREATE
87+ new_share = nc_any .files .sharing .create (
88+ "test_empty_dir" ,
89+ ShareType .TYPE_LINK ,
90+ FilePermissions .PERMISSION_CREATE + FilePermissions .PERMISSION_READ + FilePermissions .PERMISSION_DELETE ,
9291 )
93- new_share = nc_any .files .sharing .create ("test_empty_dir" , ShareType .TYPE_LINK , FilePermissions .PERMISSION_DELETE )
9492 nc_any .files .sharing .delete (new_share )
95- assert (
96- new_share .permissions
97- == FilePermissions .PERMISSION_READ | FilePermissions .PERMISSION_DELETE | FilePermissions .PERMISSION_SHARE
93+ assert (new_share .permissions & FilePermissions .PERMISSION_DELETE ) == FilePermissions .PERMISSION_DELETE
94+ new_share = nc_any .files .sharing .create (
95+ "test_empty_dir" ,
96+ ShareType .TYPE_LINK ,
97+ FilePermissions .PERMISSION_CREATE + FilePermissions .PERMISSION_READ + FilePermissions .PERMISSION_UPDATE ,
9898 )
99- new_share = nc_any .files .sharing .create ("test_empty_dir" , ShareType .TYPE_LINK , FilePermissions .PERMISSION_UPDATE )
10099 nc_any .files .sharing .delete (new_share )
101- assert (
102- new_share .permissions
103- == FilePermissions .PERMISSION_READ | FilePermissions .PERMISSION_UPDATE | FilePermissions .PERMISSION_SHARE
104- )
100+ assert (new_share .permissions & FilePermissions .PERMISSION_UPDATE ) == FilePermissions .PERMISSION_UPDATE
105101
106102
107103@pytest .mark .asyncio (scope = "session" )
@@ -110,29 +106,21 @@ async def test_create_permissions_async(anc_any):
110106 "test_empty_dir" , ShareType .TYPE_LINK , FilePermissions .PERMISSION_CREATE
111107 )
112108 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- )
109+ assert (new_share .permissions & FilePermissions .PERMISSION_CREATE ) == FilePermissions .PERMISSION_CREATE
120110 new_share = await anc_any .files .sharing .create (
121- "test_empty_dir" , ShareType .TYPE_LINK , FilePermissions .PERMISSION_DELETE
111+ "test_empty_dir" ,
112+ ShareType .TYPE_LINK ,
113+ FilePermissions .PERMISSION_CREATE + FilePermissions .PERMISSION_READ + FilePermissions .PERMISSION_DELETE ,
122114 )
123115 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- )
116+ assert (new_share .permissions & FilePermissions .PERMISSION_DELETE ) == FilePermissions .PERMISSION_DELETE
128117 new_share = await anc_any .files .sharing .create (
129- "test_empty_dir" , ShareType .TYPE_LINK , FilePermissions .PERMISSION_UPDATE
118+ "test_empty_dir" ,
119+ ShareType .TYPE_LINK ,
120+ FilePermissions .PERMISSION_CREATE + FilePermissions .PERMISSION_READ + FilePermissions .PERMISSION_UPDATE ,
130121 )
131122 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- )
123+ assert (new_share .permissions & FilePermissions .PERMISSION_UPDATE ) == FilePermissions .PERMISSION_UPDATE
136124
137125
138126def test_create_public_upload (nc_any ):
0 commit comments