Fix tests on .com (#12131)

Author: stsewd

readthedocs/oauth/services/github.py

@@ -452,7 +452,7 @@ def remove_webhook(self, project):
                         return False
         return True
 
-    def remove_ssh_key(self, project):
+    def remove_ssh_key(self, project) -> bool:
         """
         Remove the SSH key from the GitHub repository associated with the project.
 

readthedocs/profiles/tests/test_views.py

@@ -27,6 +27,7 @@
     MESSAGE_OAUTH_WEBHOOK_NOT_REMOVED,
 )
 from readthedocs.oauth.services.github import GitHubService
+from readthedocs.organizations.models import Organization
 from readthedocs.projects.models import Project
 
 
@@ -175,6 +176,20 @@ def setUp(self):
             repo="https://github.com/user/repo-e",
         )
 
+        # Make tests work on .com.
+        if settings.RTD_ALLOW_ORGANIZATIONS:
+            self.organization = get(
+                Organization,
+                owners=[self.user],
+                projects=[
+                    self.project_with_remote_repository,
+                    self.project_with_remote_repository_no_admin,
+                    self.project_with_remote_repository_no_member,
+                    self.project_with_remote_organization,
+                    self.project_without_remote_repository,
+                ],
+            )
+
         self.url = reverse("migrate_to_github_app")
         self.client.force_login(self.user)
 

readthedocs/rtd_tests/tests/test_project_forms.py

@@ -560,6 +560,8 @@ def test_change_default_branch_from_tag_to_branch_and_vice_versa(self, trigger_b
             "versioning_scheme": self.project.versioning_scheme,
             "language": self.project.language,
             "default_branch": branch.verbose_name,
+            "privacy_level": self.project.privacy_level,
+            "external_builds_privacy_level": self.project.external_builds_privacy_level,
         }
         form = UpdateProjectForm(data, instance=self.project)
         assert form.is_valid()