haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.0'

Browse Source 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
This commit is contained in:
zhengxie
2017-02-17 17:11:33 +08:00
parent 096e2e06bb 08ce98ec19
commit d82df5fb52
176 changed files with 44016 additions and 40721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/api/test_repo_user_folder_perm.py
View File

@@ -180,35 +180,6 @@ class RepoUserFolderPermTest(BaseTestCase):
resp = self.client.delete(url, data, 'application/x-www-form-urlencoded')
self.assertEqual(403, resp.status_code)
def test_invalid_path(self):
self.login_as(self.user)
invalid_path = randstring(6)
# test add
url = reverse("api2-repo-user-folder-perm", args=[self.user_repo_id])
data = {
"user_email": self.admin_email,
"folder_path": invalid_path,
"permission": self.perm_rw
}
resp = self.client.post(url, data)
self.assertEqual(404, resp.status_code)
# test modify
url = reverse("api2-repo-user-folder-perm", args=[self.user_repo_id])
data = 'user_email=%s&folder_path=%s&permission=%s' % \
(self.admin_email, invalid_path, self.perm_rw)
resp = self.client.put(url, data, 'application/x-www-form-urlencoded')
self.assertEqual(404, resp.status_code)
# test delete
url = reverse("api2-repo-user-folder-perm", args=[self.user_repo_id])
data = 'user_email=%s&folder_path=%s&permission=%s' % \
(self.admin_email, invalid_path, self.perm_rw)
resp = self.client.delete(url, data, 'application/x-www-form-urlencoded')
self.assertEqual(404, resp.status_code)
def test_invalid_user(self):
if not LOCAL_PRO_DEV_ENV:
return