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

improve djangojs.js loading (#4460)

Browse Source 
* improve djangojs.js loading

* remove send_email test
This commit is contained in:
王健辉
2020-03-02 14:43:55 +08:00
committed by GitHub
parent 2aa0a6fbc5
commit db0aeb4952
4 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/templates/base_for_react.html
View File

@@ -109,7 +109,7 @@
} }
}; };
</script> </script>
<script src="{{ STATIC_URL }}scripts/i18n/{{ LANGUAGE_CODE }}/djangojs.js"></script> <script src="{{ STATIC_URL }}scripts/i18n/{{ LANGUAGE_CODE }}/djangojs.js?v={{ seafile_version }}"></script>
{% render_bundle 'commons' %} {% render_bundle 'commons' %}
{% block extra_script %}{% endblock %} {% block extra_script %}{% endblock %}
</body> </body>

2
seahub/templates/markdown_file_view_react.html
View File

@@ -61,7 +61,7 @@
} }
} }
</script> </script>
<script src="{{ STATIC_URL }}scripts/i18n/{{ LANGUAGE_CODE }}/djangojs.js"></script> <script src="{{ STATIC_URL }}scripts/i18n/{{ LANGUAGE_CODE }}/djangojs.js?v={{ seafile_version }}"></script>
{% render_bundle 'commons' %} {% render_bundle 'commons' %}
{% render_bundle 'markdownEditor' 'js' %} {% render_bundle 'markdownEditor' 'js' %}

45
tests/api/endpoints/test_invitations.py
View File

@@ -78,27 +78,6 @@ class InvitationsTest(BaseTestCase):
self.assertEqual(400, resp.status_code) self.assertEqual(400, resp.status_code)
assert len(Invitation.objects.all()) == 0 assert len(Invitation.objects.all()) == 0
@patch.object(CanInviteGuest, 'has_permission')
@patch.object(UserPermissions, 'can_invite_guest')
def test_can_send_mail(self, mock_can_invite_guest, mock_has_permission):
mock_can_invite_guest.return_val = True
mock_has_permission.return_val = True
self.assertEqual(len(Email.objects.all()), 0)
resp = self.client.post(self.endpoint, {
'type': 'guest',
'accepter': 'some_random_user@1.com',
})
self.assertEqual(201, resp.status_code)
json_resp = json.loads(resp.content)
self.assertEqual(len(Email.objects.all()), 1)
self.assertRegex(Email.objects.all()[0].html_message,
json_resp['token'])
assert Email.objects.all()[0].status == 0
@patch.object(CanInviteGuest, 'has_permission') @patch.object(CanInviteGuest, 'has_permission')
@patch.object(UserPermissions, 'can_invite_guest') @patch.object(UserPermissions, 'can_invite_guest')
def test_can_list(self, mock_can_invite_guest, mock_has_permission): def test_can_list(self, mock_can_invite_guest, mock_has_permission):
@@ -193,30 +172,6 @@ class BatchInvitationsTest(BaseTestCase):
assert 'The email address is not allowed to be invited as a guest.' == json_resp['failed'][0]['error_msg'] assert 'The email address is not allowed to be invited as a guest.' == json_resp['failed'][0]['error_msg']
assert 'The email address is not allowed to be invited as a guest.' == json_resp['failed'][1]['error_msg'] assert 'The email address is not allowed to be invited as a guest.' == json_resp['failed'][1]['error_msg']
@patch.object(CanInviteGuest, 'has_permission')
@patch.object(UserPermissions, 'can_invite_guest')
def test_can_send_mail(self, mock_can_invite_guest, mock_has_permission):
mock_can_invite_guest.return_val = True
mock_has_permission.return_val = True
self.assertEqual(len(Email.objects.all()), 0)
resp = self.client.post(self.endpoint, {
'type': 'guest',
'accepter': ['some_random_user@1.com', 'some_random_user@2.com'],
})
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
self.assertEqual(len(Email.objects.all()), 2)
self.assertRegex(Email.objects.all()[0].html_message,
json_resp['success'][0]['token'])
self.assertRegex(Email.objects.all()[1].html_message,
json_resp['success'][1]['token'])
assert Email.objects.all()[0].status == 0
assert Email.objects.all()[1].status == 0
def test_without_permission(self): def test_without_permission(self):
self.logout() self.logout()
resp = self.client.post(self.endpoint, { resp = self.client.post(self.endpoint, {

6
tests/seahub/base/test_accounts.py
View File

@@ -25,14 +25,10 @@ class UserTest(BaseTestCase):
assert len(Email.objects.all()) == 0 assert len(Email.objects.all()) == 0
u = User.objects.get(self.user.username) u = User.objects.get(self.user.username)
u.freeze_user(notify_admins=True) u.freeze_user(notify_admins=False)
assert u.is_active is False assert u.is_active is False
assert len(Email.objects.all()) > 0
# email = Email.objects.all()[0]
# print email.html_message
def test_delete_user_options(self): def test_delete_user_options(self):
test_email = '123@123.com' test_email = '123@123.com'