Skip to content

Commit 00659a0

Browse files
committed
manager tests updated
1 parent a17d3fb commit 00659a0

File tree

1 file changed

+30
-4
lines changed

1 file changed

+30
-4
lines changed

readthedocs/rtd_tests/tests/test_managers.py

+30-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from django.contrib.auth import get_user_model
12
from django.test import TestCase
23
from django_dynamic_fixture import get
34

@@ -7,12 +8,16 @@
78
from readthedocs.projects.models import Project
89

910

11+
User = get_user_model()
12+
13+
1014
class TestVersionManagerBase(TestCase):
1115

12-
fixtures = ['eric', 'test_data']
16+
fixtures = ['test_data']
1317

1418
def setUp(self):
15-
self.client.login(username='eric', password='test')
19+
self.user = User.objects.create(username='test_user', password='test')
20+
self.client.login(username='test_user', password='test')
1621
self.pip = Project.objects.get(slug='pip')
1722
# Create a External Version. ie: PULL_REQUEST type Version.
1823
self.public_pr_version = get(
@@ -54,6 +59,12 @@ def test_internal_version_manager_with_all(self):
5459
def test_internal_version_manager_with_public(self):
5560
self.assertNotIn(self.public_pr_version, Version.internal.public())
5661

62+
def test_internal_version_manager_with_public_with_user_and_project(self):
63+
self.assertNotIn(
64+
self.public_pr_version,
65+
Version.internal.public(self.user, self.pip)
66+
)
67+
5768
def test_internal_version_manager_with_protected(self):
5869
self.assertNotIn(self.protected_pr_version, Version.internal.protected())
5970

@@ -83,6 +94,17 @@ def test_external_version_manager_with_public(self):
8394
self.assertNotIn(self.internal_versions, Version.external.public())
8495
self.assertIn(self.public_pr_version, Version.external.public())
8596

97+
def test_external_version_manager_with_public_with_user_and_project(self):
98+
self.assertNotIn(
99+
self.internal_versions,
100+
Version.external.public(self.user, self.pip)
101+
)
102+
self.assertIn(
103+
self.public_pr_version,
104+
Version.external.public(self.user, self.pip)
105+
)
106+
107+
86108
def test_external_version_manager_with_protected(self):
87109
self.assertNotIn(self.internal_versions, Version.external.protected())
88110
self.assertIn(self.protected_pr_version, Version.external.protected())
@@ -96,5 +118,9 @@ def test_external_version_manager_with_api(self):
96118
self.assertIn(self.public_pr_version, Version.external.api())
97119

98120
def test_external_version_manager_with_for_project(self):
99-
self.assertNotIn(self.internal_versions, Version.external.for_project(self.pip))
100-
self.assertIn(self.public_pr_version, Version.external.for_project(self.pip))
121+
self.assertNotIn(
122+
self.internal_versions, Version.external.for_project(self.pip)
123+
)
124+
self.assertIn(
125+
self.public_pr_version, Version.external.for_project(self.pip)
126+
)

0 commit comments

Comments
 (0)