External naming updated

Author: saadmk11

readthedocs/builds/models.py

@@ -746,9 +746,9 @@ def using_latest_config(self):
         return int(self.config.get('version', '1')) == LATEST_CONFIGURATION_VERSION
 
     @property
-    def is_pr(self):
-        """Return if build is a Pull Request Build."""
-        return self.version.type == PULL_REQUEST
+    def is_external(self):
+        """Return if build is a External ie: Pull/Merge Request Build."""
+        return self.version.type == EXTERNAL
 
 
 class BuildCommandResultMixin:

readthedocs/builds/views.py

@@ -117,8 +117,8 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class PRBuildList(BuildBase, ListView):
-    template_name = 'builds/pr_build_list.html'
+class ExternalBuildList(BuildBase, ListView):
+    template_name = 'builds/external_build_list.html'
 
     def get_queryset(self):
         # this is used to include only internal version

readthedocs/projects/models.py

@@ -519,9 +519,9 @@ def get_builds_url(self):
             },
         )
 
-    def get_pr_builds_url(self):
+    def get_external_builds_url(self):
         return reverse(
-            'pr_builds_project_list',
+            'external_builds_project_list',
             kwargs={
                 'project_slug': self.slug,
             },

readthedocs/projects/urls/public.py

@@ -73,8 +73,8 @@
     ),
     url(
         (r'^(?P<project_slug>{project_slug})/builds/pr/$'.format(**pattern_opts)),
-        build_views.PRBuildList.as_view(),
-        name='pr_builds_project_list',
+        build_views.ExternalBuildList.as_view(),
+        name='external_builds_project_list',
     ),
     url(
         r'^(?P<project_slug>{project_slug})/versions/$'.format(**pattern_opts),

readthedocs/rtd_tests/tests/test_builds.py

@@ -7,7 +7,7 @@
 from django_dynamic_fixture import fixture, get
 from django.utils import timezone
 
-from readthedocs.builds.constants import PULL_REQUEST
+from readthedocs.builds.constants import EXTERNAL
 from readthedocs.builds.models import Build, Version
 from readthedocs.doc_builder.config import load_yaml_config
 from readthedocs.doc_builder.environments import LocalBuildEnvironment
@@ -584,26 +584,26 @@ def test_using_latest_config(self):
 
         self.assertTrue(build.using_latest_config())
 
-    def test_build_is_pr(self):
-        # Turn the build version to pull request type.
-        self.version.type = PULL_REQUEST
+    def test_build_is_external(self):
+        # Turn the build version to EXTERNAL type.
+        self.version.type = EXTERNAL
         self.version.save()
 
-        pr_build = get(
+        external_build = get(
             Build,
             project=self.project,
             version=self.version,
             config={'version': 1},
         )
 
-        self.assertTrue(pr_build.is_pr)
+        self.assertTrue(external_build.is_external)
 
-    def test_build_is_not_pr(self):
+    def test_build_is_not_external(self):
         build = get(
             Build,
             project=self.project,
             version=self.version,
             config={'version': 1},
         )
 
-        self.assertFalse(build.is_pr)
+        self.assertFalse(build.is_external)

readthedocs/rtd_tests/tests/test_doc_serving.py

@@ -240,16 +240,6 @@ def test_sitemap_xml(self):
             project=self.public,
             active=True
         )
-        # This is a EXTERNAL Version
-        external_version = fixture.get(
-            Version,
-            identifier='pr-version',
-            verbose_name='pr-version',
-            slug='pr-9999',
-            project=self.public,
-            active=True,
-            type=EXTERNAL
-        )
         stable_version = fixture.get(
             Version,
             identifier='stable',

readthedocs/rtd_tests/tests/test_project.py

@@ -166,9 +166,9 @@ def test_has_good_build_excludes_external_versions(self):
         # Test that PR Version is not considered for has_good_build.
         self.assertFalse(self.pip.has_good_build)
 
-    def test_get_pr_builds_url(self):
+    def test_get_external_builds_url(self):
         self.assertEqual(
-            self.pip.get_pr_builds_url(),
+            self.pip.get_external_builds_url(),
             f'/projects/{self.pip.slug}/builds/pr/'
         )
 

readthedocs/rtd_tests/tests/test_views.py

@@ -7,7 +7,7 @@
 from django.urls import reverse
 from django_dynamic_fixture import get, new
 
-from readthedocs.builds.constants import LATEST, EXTERNAL
+from readthedocs.builds.constants import LATEST, EXTERNAL, BRANCH
 from readthedocs.builds.models import Build, Version
 from readthedocs.core.permissions import AdminPermission
 from readthedocs.projects.forms import UpdateProjectForm
@@ -297,26 +297,26 @@ def test_build_list_does_not_include_external_versions(self):
         self.assertNotIn(external_version_build, response.context['build_qs'])
         self.assertNotIn(external_version_build, response.context['active_builds'])
 
-    def test_pr_build_list_includes_pr_version_builds(self):
-        pr_version = get(
+    def test_external_build_list_includes_external_version_builds(self):
+        external_version = get(
             Version,
             project = self.pip,
             active = True,
-            type = PULL_REQUEST,
+            type = EXTERNAL,
         )
-        pr_version_build = get(
+        external_version_build = get(
             Build,
             project = self.pip,
-            version = pr_version
+            version = external_version
         )
         response = self.client.get(
-            reverse('pr_builds_project_list', args=[self.pip.slug]),
+            reverse('external_builds_project_list', args=[self.pip.slug]),
         )
 
         self.assertEqual(response.status_code, 200)
-        self.assertIn(pr_version_build, response.context['build_qs'])
+        self.assertIn(external_version_build, response.context['build_qs'])
 
-    def test_pr_build_list_does_not_include_internal_version_builds(self):
+    def test_external_build_list_does_not_include_internal_version_builds(self):
         internal_version = get(
             Version,
             project = self.pip,
@@ -329,7 +329,7 @@ def test_pr_build_list_does_not_include_internal_version_builds(self):
             version = internal_version
         )
         response = self.client.get(
-            reverse('pr_builds_project_list', args=[self.pip.slug]),
+            reverse('external_builds_project_list', args=[self.pip.slug]),
         )
 
         self.assertEqual(response.status_code, 200)

readthedocs/templates/builds/build_detail.html

@@ -23,9 +23,9 @@
 
 {% block project_editing %}
 
-  {% if build.is_pr %}
+  {% if build.is_external %}
 
-    {% with pr_builds_active="active" %}
+    {% with external_builds_active="active" %}
       {% include "core/project_bar.html" %}
     {% endwith %}
   {% else %}

readthedocs/templates/builds/pr_build_list.html renamed to readthedocs/templates/builds/external_build_list.html

@@ -10,7 +10,7 @@
 {% block title %}Builds{% endblock %}
 
 {% block project_editing %}
-    {% with pr_builds_active="active" %}
+    {% with external_builds_active="active" %}
         {% include "core/project_bar.html" %}
     {% endwith %}
 {% endblock %}
@@ -25,7 +25,7 @@
         <!-- BEGIN builds list -->
         <div class="module">
           <div class="module-wrapper">
-            <h1>{% trans "Recent Pull Request Builds" %}</h1>
+            <h1>{% trans "Recent External Builds" %}</h1>
 
             <div class="module-list">
               <div class="module-list-wrapper">

readthedocs/templates/core/project_bar_base.html

@@ -45,7 +45,7 @@ <h1>
 
         <li class="{{ builds_active }}"><a href="{{ project.get_builds_url }}">{% trans "Builds" %}</a></li>
 
-        <li class="{{ pr_builds_active }}"><a href="{{ project.get_pr_builds_url }}">{% trans "PR Builds" %}</a></li>
+        <li class="{{ external_builds_active }}"><a href="{{ project.get_external_builds_url }}">{% trans "External Builds" %}</a></li>
 
         <li class="{{ versions_active }}"><a href="{% url "project_version_list" project.slug %}">{% trans "Versions" %}</a></li>