use get_default_version()

Author: dojutsu-user

readthedocs/core/utils/__init__.py

@@ -16,7 +16,7 @@
 from django.utils.text import slugify as slugify_base
 from celery import group, chord
 
-from readthedocs.builds.constants import LATEST, BUILD_STATE_TRIGGERED
+from readthedocs.builds.constants import BUILD_STATE_TRIGGERED
 from readthedocs.doc_builder.constants import DOCKER_LIMITS
 
 log = logging.getLogger(__name__)
@@ -95,12 +95,8 @@ def prepare_build(
         return (None, None)
 
     if not version:
-        default_branch = project.default_branch
-        version_ = project.versions.filter(slug=default_branch)
-        if version_.exists():
-            version = version_.first()
-        else:
-            version = project.versions.get(slug=LATEST)
+        default_version = project.get_default_version()
+        version = project.versions.get(slug=default_version)
 
     kwargs = {
         'version_pk': version.pk,

readthedocs/rtd_tests/tests/test_core_utils.py

@@ -36,47 +36,21 @@ def test_trigger_skipped_project(self, update_docs_task):
         self.assertFalse(update_docs_task.signature().apply_async.called)
 
     @mock.patch('readthedocs.projects.tasks.update_docs_task')
-    def test_trigger_build_when_default_branch_exists(self, update_docs_task):
-        self.assertFalse(Version.objects.filter(slug='test-slug').exists())
+    def test_trigger_build_when_version_not_provided(self, update_docs_task):
 
-        project_1 = get(Project)
-        version_1 = get(Version, project=project_1, slug='test-slug')
-        project_1.default_branch = 'test-slug'
-        project_1.save()
-
-        trigger_build(project=project_1)
+        trigger_build(project=self.project)
+        default_version = self.project.get_default_version()
+        version_ = self.project.versions.get(slug=default_version)
         kwargs = {
-            'version_pk': version_1.pk,
+            'version_pk': version_.pk,
             'record': True,
             'force': False,
             'build_pk': mock.ANY,
         }
 
         update_docs_task.signature.assert_has_calls([
             mock.call(
-                args=(project_1.pk,),
-                kwargs=kwargs,
-                options=mock.ANY,
-                immutable=True,
-            ),
-        ])
-
-    @mock.patch('readthedocs.projects.tasks.update_docs_task')
-    def test_trigger_build_when_default_branch_doesnt_exist(self, update_docs_task):
-        project_1 = get(Project, default_branch=None)
-        latest_version = project_1.versions.get(slug=LATEST)
-
-        trigger_build(project=project_1)
-        kwargs = {
-            'version_pk': latest_version.pk,
-            'record': True,
-            'force': False,
-            'build_pk': mock.ANY
-        }
-
-        update_docs_task.signature.assert_has_calls([
-            mock.call(
-                args=(project_1.pk,),
+                args=(self.project.pk,),
                 kwargs=kwargs,
                 options=mock.ANY,
                 immutable=True,