haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

Python3 master (#4076)

Browse Source 
* delete thridpart/social_django

* delete social_django in seahub/urls.py

* delete social_django in seahub/settings.py

* delete seahub/notifications/management/commands/send_wxwork_notices.py

* delete social_django in code annotation

* delete seahub/social_core

* delete tests/seahub/social_core

* delete social_core in seahub/urls.py

* delete social_core in seahub/settings.py

* change app_label to auth in SocialAuthUser model

* 2to3 asserts

* 2to3 basestring

* 2to3 dict

* 2to3 except

* 2to3 filter

* 2to3 future

* 2to3 has_key

* 2to3 idioms

* 2to3 import

* 2to3 imports

* 2to3 long

* 2to3 map

* 2to3 next

* 2to3 numliterals

* 2to3 print

* 2to3 raise

* 2to3 raw_input

* 2to3 reduce

* 2to3 reload

* 2to3 set_literal

* 2to3 unicode

* 2to3 urllib

* 2to3 ws_comma

* 2to3 xrange

* 2to3 zip

* add pymysql in __init__.py

* fix encode and decode in seahub/cconvert.py

* fix seafserv_rpc.is_passwd_set in seahub/views/__init__.py

* fix smart_unicode to smart_text

* fix force_unicode to force_text

* delete seaserv.get_session_info

* delete seaserv.ccnet_rpc

* fix indent error in seahub/auth/middleware.py

* update dev-requirements

* update test-requirements

* update requirements

* fix StringIO to BytesIO in thumbnail

* fix seaserv.list_inner_pub_repos to seafile_api.get_inner_pub_repo_list

* fix seaserv.list_org_inner_pub_repos to seafile_api.list_org_inner_pub_repos

* add logger in seahub/utils/__init__.py

* fix sort cmp in seahub/views/__init__.py

* fix sort cmp in seahub/base/management/commands/export_file_access_log.py

* fix sort cmp in seahub/api2/endpoints/repo_trash.py

* fix sort cmp in seahub/api2/endpoints/shared_repos.py

* fix sort cmp in seahub/api2/endpoints/shared_folders.py

* fix sort cmp in seahub/wiki/views.py

* fix sort cmp in seahub/api2/endpoints/wiki_pages.py

* fix sort cmp in seahub/api2/endpoints/group_libraries.py

* fix sort cmp in seahub/base/models.py

* fix sort cmp in seahub/api2/endpoints/upload_links.py

* fix sort cmp in seahub/views/ajax.py

* fix sort cmp in seahub/api2/views.py

* fix sort cmp in seahub/views/wiki.py

* fix sort cmp in seahub/api2/endpoints/repos.py

* fix sort cmp in seahub/api2/endpoints/starred_items.py

* fix sort cmp in seahub/views/file.py

* fix sort cmp in seahub/api2/endpoints/dir.py

* fix sort cmp in seahub/api2/endpoints/share_links.py

* fix cmp to cmp_to_key in seahub/api2/endpoints/admin/device_trusted_ip.py

* fix cmp to cmp_to_key in tests/api/endpoints/admin/test_device_trusted_ip.py

* delete encode('utf-8') in seafile_api.list_dir_by_commit_and_path

* delete encode('utf-8') in is_file_starred

* delete encode('utf-8') in seafile_api.list_dir_by_path

* delete path.encode('utf-8') in seahub/views/file.py

* fix os.write to add encode('utf-8')

* add encode('utf-8') for hashlib

* add encode('utf-8') for hmac

* fix with open(file, 'wb') for binary file

* fix encode and decode in seahub/utils/hasher.py

* fix next in thirdpart/shibboleth/views.py

* fix next in seahub/profile/views.py

* fix next in seahub/notifications/views.py

* fix next in seahub/institutions/views.py

* fix next in seahub/options/views.py

* fix next in seahub/share/views.py

* fix next in seahub/avatar/views.py

* fix next in seahub/views/__init__.py

* fix next in seahub/group/views.py

* fix next in seahub/views/wiki.py

* fix next in seahub/views/sysadmin.py

* fix next in seahub/views/file.py

* fix string.lowercase to string.ascii_lowercase in test

* fix open file add 'rb' in test

* fix self.user.username in test

* add migrations in file_participants

* fix list_org_inner_pub_repos to list_org_inner_pub_repos_by_owner

* fix from seaserv import is_passwd_set to seafile_api.is_password_set

* fix assert bytes resp.content in test

* fix seafile_api.get_inner_pub_repo_list to seafile_api.list_inner_pub_repos_by_owner

* fix seafile_api.is_passwd_set to seafile_api.is_password_set

* fix AccountsApiTest assert length

* rewrite sort_devices cmp to operator.lt

* fix bytes + str in seahub/api2/views.py

* fix assert bytes resp.content in test

* fix hashlib encode in seahub/thirdpart/registration/models.py

* change app_label to base in SocialAuthUser

* fix base64 encode in seahub/base/database_storage/database_storage.py

* fix assert bytes resp.content

* remove path.decode in def mkstemp()

* remove path.decode in FpathToLinkTest

* remove str decode in FileTagTest

* remove mock_write_xls.assert_called_once() in SysUserAdminExportExcelTest

* fix urllib assert in FilesApiTest

* fix link fields in FileCommentsTest

* fix get_related_users_by_repo()

* fix assert list in GetRepoSharedUsersTest

* fix create user in AccountTest

* fix repeated key in dict seahub/api2/views.py

* add drone.yml

* update nginx conf in test

* update test conf in test

* update dist and push after test success

* update drone conf to dist and push

* fix assert in BeSharedReposTest

* fix seafile_api.list_org_inner_pub_repos_by_owner(org_id, username) to seafile_api.list_org_inner_pub_repos(org_id)

* fix seafile_api.list_inner_pub_repos_by_owner(username) to seafile_api.get_inner_pub_repo_list()

* update pyjwt requirement

* update dist branch in drone

* add SKIP in dist and push

* fix StringIO to BytesIO in seahub/avatar/models.py

* fix if org_id > 0 to if org_id and org_id > 0

* remove payment

* fix StringIO to BytesIO in seahub/base/database_storage/database_storage.py

* fix send_message to seafile_api.publish_event in seahub/drafts/utils.py

* fix send_message to seafile_api.publish_event in seahub/api2/views.py

* fix send_message to seafile_api.publish_event in seahub/api2/endpoints/repos.py

* fix send_message to seafile_api.publish_event in seahub/views/file.py

* fix send_message to seafile_api.publish_event in seahub/utils/__init__.py

* fix image_file.read encode in seahub/base/database_storage/database_storage.py

* fix DatabaseStorageTest

* remove .travis.yml

* drone branch include master
This commit is contained in:
sniper-py
2019-09-11 11:46:43 +08:00
committed by Daniel Pan
parent 835015c3a8
commit 99a9ece04e
364 changed files with 1983 additions and 4138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
thirdpart/termsandconditions/tests.py
View File

@@ -74,22 +74,22 @@ class TermsAndConditionsTests(TestCase):
UserTermsAndConditions.objects.create(user=self.user1, terms=self.terms1)
UserTermsAndConditions.objects.create(user=self.user2, terms=self.terms3)
self.assertEquals(1.0, self.user1.userterms.get().terms.version_number)
self.assertEquals(1.5, self.user2.userterms.get().terms.version_number)
self.assertEqual(1.0, self.user1.userterms.get().terms.version_number)
self.assertEqual(1.5, self.user2.userterms.get().terms.version_number)
self.assertEquals('user1', self.terms1.users.all()[0].username)
self.assertEqual('user1', self.terms1.users.all()[0].username)
# Testing the get_active static method of TermsAndConditions
self.assertEquals(2.0, TermsAndConditions.get_active(slug='site-terms').version_number)
self.assertEquals(1.5, TermsAndConditions.get_active(slug='contrib-terms').version_number)
self.assertEqual(2.0, TermsAndConditions.get_active(slug='site-terms').version_number)
self.assertEqual(1.5, TermsAndConditions.get_active(slug='contrib-terms').version_number)
# Testing the agreed_to_latest static method of TermsAndConditions
self.assertEquals(False, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms'))
self.assertEquals(True, TermsAndConditions.agreed_to_latest(user=self.user2, slug='contrib-terms'))
self.assertEqual(False, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms'))
self.assertEqual(True, TermsAndConditions.agreed_to_latest(user=self.user2, slug='contrib-terms'))
# Testing the unicode method of TermsAndConditions
self.assertEquals('site-terms-2.00', str(TermsAndConditions.get_active(slug='site-terms')))
self.assertEquals('contrib-terms-1.50', str(TermsAndConditions.get_active(slug='contrib-terms')))
self.assertEqual('site-terms-2.00', str(TermsAndConditions.get_active(slug='site-terms')))
self.assertEqual('contrib-terms-1.50', str(TermsAndConditions.get_active(slug='contrib-terms')))
def test_middleware_redirect(self):
"""Validate that a user is redirected to the terms accept page if they are logged in, and decorator is on method"""
@@ -141,7 +141,7 @@ class TermsAndConditionsTests(TestCase):
chained_terms_response = self.client.post('/terms/accept/', {'terms': 2, 'returnTo': '/secure/'}, follow=True)
self.assertContains(chained_terms_response, "Contributor")
self.assertEquals(True, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms'))
self.assertEqual(True, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms'))
LOGGER.debug('Test /terms/accept/contrib-terms/1.5/ post')
accept_version_response = self.client.get('/terms/accept/contrib-terms/1.5/', follow=True)
@@ -176,7 +176,7 @@ class TermsAndConditionsTests(TestCase):
TermsAndConditions.objects.all().delete()
num_terms = TermsAndConditions.objects.count()
self.assertEquals(0, num_terms)
self.assertEqual(0, num_terms)
LOGGER.debug('Test user1 login for autocreate')
login_response = self.client.login(username='user1', password='user1password')
@@ -188,14 +188,14 @@ class TermsAndConditionsTests(TestCase):
LOGGER.debug('Test TermsAndConditions Object Was Created')
num_terms = TermsAndConditions.objects.count()
self.assertEquals(1, num_terms)
self.assertEqual(1, num_terms)
terms = TermsAndConditions.objects.get()
self.assertEquals('site-terms-1.00', str(terms))
self.assertEqual('site-terms-1.00', str(terms))
LOGGER.debug('Test Not Creating Non-Default TermsAndConditions')
non_default_response = self.client.get('/terms/accept/contrib-terms/', follow=True)
self.assertEquals(404, non_default_response.status_code)
self.assertEqual(404, non_default_response.status_code)
def test_terms_upgrade(self):
"""Validate a user is prompted to accept terms again when new version comes out"""