Project: use get_original_latest_version in form (#12460)

This is the same logic we have in


https://github.com/readthedocs/readthedocs.org/blob/a8a29fe29292027a4e2a44cc468cea4adc70e390/readthedocs/projects/models.py#L1164-L1181

and it already excludes latest

I'm doing small refactors to rely less on get_default_branch, as that
contains some extra logic that we already run to have latest always in
sync.

Author: stsewd

readthedocs/projects/forms.py

@@ -145,8 +145,8 @@ class ProjectTriggerBuildMixin:
     """
     Mixin to trigger build on form save.
 
-    We trigger a build to the default branch and the LATEST version of the project,
-    since both are related, latest is an alias of the default version.
+    We trigger a build to LATEST version of the project, and the version
+    that LATEST points to, since latest is just an alias.
 
     This should be replaced with signals instead of calling trigger_build
     explicitly.
@@ -156,11 +156,11 @@ def save(self, commit=True):
         """Trigger build on commit save."""
         project = super().save(commit)
         if commit:
-            default_branch = project.versions.filter(slug=project.get_default_branch()).first()
-            if default_branch and default_branch.active:
-                trigger_build(project=project, version=default_branch)
+            original_latest_version = project.get_original_latest_version()
+            if original_latest_version and original_latest_version.active:
+                trigger_build(project=project, version=original_latest_version)
             latest_version = project.get_latest_version()
-            if latest_version and latest_version != default_branch and latest_version.active:
+            if latest_version and latest_version.active:
                 trigger_build(project=project, version=latest_version)
         return project
 

readthedocs/rtd_tests/tests/test_project_forms.py

@@ -300,9 +300,16 @@ def test_custom_readthedocs_yaml(self, trigger_build):
     @mock.patch("readthedocs.projects.forms.trigger_build")
     def test_trigger_build_on_save(self, trigger_build):
         latest_version = self.project.get_latest_version()
-        default_branch = get(Version, project=self.project, slug="main", active=True)
-
-        self.project.default_branch = default_branch.slug
+        default_branch = get(
+            Version,
+            project=self.project,
+            slug="main",
+            active=True,
+            type=BRANCH,
+            verbose_name="main",
+            identifier="main",
+        )
+        self.project.default_branch = default_branch.verbose_name
         self.project.save()
 
         data = {