Merge remote-tracking branch 'origin/versions/micro' into client_bc_merge_micro

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-10-07 10:02:48 -04:00
1286 changed files with 11020 additions and 7737 deletions

View File

@@ -14,7 +14,6 @@ from django.utils.http import urlunquote_plus
from mayan.apps.common.tests import GenericViewTestCase
from mayan.apps.smart_settings.classes import Namespace
from mayan.apps.user_management.permissions import permission_user_edit
from mayan.apps.user_management.tests.mixins import UserTestMixin
from mayan.apps.user_management.tests.literals import TEST_USER_PASSWORD_EDITED
from ..settings import setting_maximum_session_length
@@ -39,7 +38,9 @@ class CurrentUserViewTestCase(GenericViewTestCase):
self.assertEqual(response.status_code, 200)
self._test_case_user.refresh_from_db()
self.assertTrue(self._test_case_user.check_password(raw_password=new_password))
self.assertTrue(
self._test_case_user.check_password(raw_password=new_password)
)
class UserLoginTestCase(GenericViewTestCase):
@@ -262,7 +263,7 @@ class UserLoginTestCase(GenericViewTestCase):
self.assertEqual(response.redirect_chain, [(TEST_REDIRECT_URL, 302)])
class UserViewTestCase(UserTestMixin, UserPasswordViewTestMixin, GenericViewTestCase):
class UserViewTestCase(UserPasswordViewTestMixin, GenericViewTestCase):
def test_user_set_password_view_no_access(self):
self._create_test_user()