matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into development

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-29 01:55:42 -04:00
parent 17b7d6f25e 6a8868e632
commit ba1ab5d4f1
1677 changed files with 40824 additions and 21204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/checkouts/tests/test_models.py
+3 -3
View File
@@ -10,7 +10,7 @@ from django.utils.timezone import now
from common.tests import BaseTestCase
from documents.models import DocumentType
from documents.tests.literals import (
TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH
TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH
)
from user_management.tests.literals import (
TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD
@@ -33,7 +33,7 @@ class DocumentCheckoutTestCase(BaseTestCase):
)
self.document_type = DocumentType.objects.create(
label=TEST_DOCUMENT_TYPE
label=TEST_DOCUMENT_TYPE_LABEL
)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
@@ -136,7 +136,7 @@ class NewVersionBlockTestCase(BaseTestCase):
super(NewVersionBlockTestCase, self).setUp()
self.document_type = DocumentType.objects.create(
label=TEST_DOCUMENT_TYPE
label=TEST_DOCUMENT_TYPE_LABEL
)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object: