mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Merge branch 'dev' into feature-permissions
This commit is contained in:
		| @@ -2,12 +2,13 @@ from django.contrib.auth.models import User | ||||
| from documents.models import Correspondent | ||||
| from documents.models import DocumentType | ||||
| from documents.models import Tag | ||||
| from documents.tests.utils import DirectoriesMixin | ||||
| from paperless_mail.models import MailAccount | ||||
| from paperless_mail.models import MailRule | ||||
| from rest_framework.test import APITestCase | ||||
|  | ||||
|  | ||||
| class TestAPIMailAccounts(APITestCase): | ||||
| class TestAPIMailAccounts(DirectoriesMixin, APITestCase): | ||||
|     ENDPOINT = "/api/mail_accounts/" | ||||
|  | ||||
|     def setUp(self): | ||||
| @@ -165,7 +166,7 @@ class TestAPIMailAccounts(APITestCase): | ||||
|         self.assertEqual(returned_account2.password, "123xyz") | ||||
|  | ||||
|  | ||||
| class TestAPIMailRules(APITestCase): | ||||
| class TestAPIMailRules(DirectoriesMixin, APITestCase): | ||||
|     ENDPOINT = "/api/mail_rules/" | ||||
|  | ||||
|     def setUp(self): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 shamoon
					shamoon