Merge pull request #6673 from readthedocs/humitos/use-https-public

Use PUBLIC_DOMAIN_USES_HTTPS for resolver tests

Author: humitos

readthedocs/core/resolver.py

@@ -192,7 +192,10 @@ def resolve(
             # or fallback to settings
             settings.PUBLIC_DOMAIN_USES_HTTPS and
             settings.PUBLIC_DOMAIN and
-            settings.PUBLIC_DOMAIN in domain,
+            any([
+                settings.PUBLIC_DOMAIN in domain,
+                settings.RTD_EXTERNAL_VERSION_DOMAIN in domain,
+            ]),
         ])
         protocol = 'https' if use_https_protocol else 'http'
 

readthedocs/rtd_tests/tests/test_resolver.py

@@ -475,18 +475,19 @@ def test_domain_public(self):
         PRODUCTION_DOMAIN='readthedocs.org',
         PUBLIC_DOMAIN='public.readthedocs.org',
         RTD_EXTERNAL_VERSION_DOMAIN='dev.readthedocs.build',
+        PUBLIC_DOMAIN_USES_HTTPS=True,
         USE_SUBDOMAIN=True,
     )
     def test_domain_external(self):
         latest = self.pip.versions.first()
         latest.type = EXTERNAL
         latest.save()
         url = resolve(project=self.pip)
-        self.assertEqual(url, 'http://pip--latest.dev.readthedocs.build/en/latest/')
+        self.assertEqual(url, 'https://pip--latest.dev.readthedocs.build/en/latest/')
         url = resolve(project=self.pip, version_slug=latest.slug)
-        self.assertEqual(url, 'http://pip--latest.dev.readthedocs.build/en/latest/')
+        self.assertEqual(url, 'https://pip--latest.dev.readthedocs.build/en/latest/')
         url = resolve(project=self.pip, version_slug='non-external')
-        self.assertEqual(url, 'http://pip.public.readthedocs.org/en/non-external/')
+        self.assertEqual(url, 'https://pip.public.readthedocs.org/en/non-external/')
 
 
 class ResolverTests(ResolverBase):