Skip to content

Commit 99f55a0

Browse files
Adding VersionManager.create_latest and using it where applicable.
1 parent d9584d4 commit 99f55a0

File tree

6 files changed

+21
-28
lines changed

6 files changed

+21
-28
lines changed

readthedocs/privacy/backend.py

+15-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
from guardian.shortcuts import get_objects_for_user
55

6+
from builds.constants import LATEST
7+
from builds.constants import LATEST_VERBOSE_NAME
68
from builds.constants import STABLE
79
from builds.constants import STABLE_VERBOSE_NAME
810
from projects import constants
@@ -125,7 +127,19 @@ def create_stable(self, **kwargs):
125127
'type': 'branch',
126128
}
127129
defaults.update(kwargs)
128-
return self.create(**kwargs)
130+
return self.create(**defaults)
131+
132+
def create_latest(self, **kwargs):
133+
defaults = {
134+
'slug': LATEST,
135+
'verbose_name': LATEST_VERBOSE_NAME,
136+
'machine': True,
137+
'active': True,
138+
'identifier': LATEST,
139+
'type': 'branch',
140+
}
141+
defaults.update(kwargs)
142+
return self.create(**defaults)
129143

130144

131145
class AdminPermission(object):

readthedocs/rtd_tests/tests/test_404.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
from django.test import TestCase
44

5-
from builds.constants import LATEST
6-
from builds.constants import LATEST_VERBOSE_NAME
7-
from builds.models import Version
85
from projects.models import Project
96

107

@@ -14,9 +11,7 @@ class Testmaker(TestCase):
1411
def setUp(self):
1512
self.client.login(username='eric', password='test')
1613
self.pip = Project.objects.get(slug='pip')
17-
self.latest = Version.objects.create(project=self.pip, identifier=LATEST,
18-
verbose_name=LATEST_VERBOSE_NAME, slug=LATEST,
19-
active=True)
14+
self.latest = self.pip.versions.create_latest()
2015
self.pip_es = Project.objects.create(name="PIP-ES", slug='pip-es', language='es', main_language_project=self.pip)
2116

2217
def test_project_does_not_exist(self):

readthedocs/rtd_tests/tests/test_bookmarks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def test_delete_bookmark_with_json(self):
8181

8282
post_data = {
8383
"project": self.project.slug,
84-
"version": 'latest',
84+
"version": LATEST,
8585
"page": "",
8686
"url": "",
8787
}

readthedocs/rtd_tests/tests/test_footer.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
from django.test import TestCase
44

5-
from builds.constants import LATEST
6-
from builds.constants import LATEST_VERBOSE_NAME
7-
from builds.models import Version
85
from projects.models import Project
96

107

@@ -14,9 +11,7 @@ class Testmaker(TestCase):
1411
def setUp(self):
1512
self.client.login(username='eric', password='test')
1613
self.pip = Project.objects.get(slug='pip')
17-
self.latest = Version.objects.create(project=self.pip, identifier=LATEST,
18-
verbose_name=LATEST_VERBOSE_NAME, slug=LATEST,
19-
active=True)
14+
self.latest = self.pip.versions.create_latest()
2015

2116
def test_footer(self):
2217
r = self.client.get('/api/v2/footer_html/?project=pip&version=latest&page=index', {})

readthedocs/rtd_tests/tests/test_redirects.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
from django.test.utils import override_settings
33

44
from builds.constants import LATEST
5-
from builds.constants import LATEST_VERBOSE_NAME
6-
from builds.models import Version
75
from projects.models import Project
86
from redirects.models import Redirect
97

@@ -29,9 +27,7 @@ def setUp(self):
2927
'description': 'wat',
3028
'documentation_type': 'sphinx'})
3129
pip = Project.objects.get(slug='pip')
32-
Version.objects.create(project=pip, identifier=LATEST,
33-
verbose_name=LATEST_VERBOSE_NAME, slug=LATEST,
34-
active=True)
30+
pip.versions.create_latest()
3531

3632
def test_proper_url_no_slash(self):
3733
r = self.client.get('/docs/pip')
@@ -198,9 +194,7 @@ def setUp(self):
198194
'description': 'wat',
199195
'documentation_type': 'sphinx'})
200196
self.pip = Project.objects.get(slug='pip')
201-
Version.objects.create(project=self.pip, identifier=LATEST,
202-
verbose_name=LATEST_VERBOSE_NAME, slug=LATEST,
203-
active=True)
197+
self.pip.versions.create_latest()
204198

205199
@override_settings(USE_SUBDOMAIN=True)
206200
def test_redirect_root(self):

readthedocs/rtd_tests/tests/test_repo_parsing.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
from django.test import TestCase
44

5-
from builds.constants import LATEST
6-
from builds.constants import LATEST_VERBOSE_NAME
7-
from builds.models import Version
85
from projects.models import Project
96

107

@@ -14,9 +11,7 @@ class TestRepoParsing(TestCase):
1411
def setUp(self):
1512
self.client.login(username='eric', password='test')
1613
self.pip = Project.objects.get(slug='pip')
17-
self.version = Version.objects.create(project=self.pip, identifier=LATEST,
18-
verbose_name=LATEST_VERBOSE_NAME, slug=LATEST,
19-
active=True)
14+
self.version = self.pip.versions.create_latest()
2015

2116
def test_github(self):
2217
self.pip.repo = 'https://github.com/user/repo'

0 commit comments

Comments
 (0)