Skip to content

Commit af3bf8c

Browse files
committed
Tests: create an organization when running in .com
One test is failing because the project doesn't belong to an organization. Now that we have those models here, I think we should create the organization here instead of allowing it to fail.
1 parent d72ee6e commit af3bf8c

File tree

1 file changed

+50
-3
lines changed

1 file changed

+50
-3
lines changed

readthedocs/rtd_tests/tests/test_sync_versions.py

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
import json
22
from unittest import mock
33

4+
from django.conf import settings
5+
from django.contrib.auth.models import User
46
from django.test import TestCase
57
from django.urls import reverse
8+
from django_dynamic_fixture import get
69

710
from readthedocs.builds.constants import BRANCH, LATEST, STABLE, TAG
811
from readthedocs.builds.models import (
912
RegexAutomationRule,
1013
Version,
1114
VersionAutomationRule,
1215
)
16+
from readthedocs.organizations.models import Organization, OrganizationOwner
17+
from readthedocs.projects.constants import PUBLIC
1318
from readthedocs.projects.models import Project
1419

1520

@@ -18,8 +23,22 @@ class TestSyncVersions(TestCase):
1823
fixtures = ['eric', 'test_data']
1924

2025
def setUp(self):
21-
self.client.login(username='eric', password='test')
26+
self.user = User.objects.get(username='eric')
27+
self.client.force_login(self.user)
2228
self.pip = Project.objects.get(slug='pip')
29+
30+
# Run tests for .com
31+
if settings.ALLOW_PRIVATE_REPOS:
32+
self.org = get(
33+
Organization,
34+
name='testorg',
35+
)
36+
OrganizationOwner.objects.create(
37+
owner=self.user,
38+
organization=self.org,
39+
)
40+
self.org.projects.add(self.pip)
41+
2342
Version.objects.create(
2443
project=self.pip,
2544
identifier='origin/master',
@@ -908,9 +927,23 @@ class TestStableVersion(TestCase):
908927
fixtures = ['eric', 'test_data']
909928

910929
def setUp(self):
911-
self.client.login(username='eric', password='test')
930+
self.user = User.objects.get(username='eric')
931+
self.client.force_login(self.user)
912932
self.pip = Project.objects.get(slug='pip')
913933

934+
# Run tests for .com
935+
if settings.ALLOW_PRIVATE_REPOS:
936+
self.org = get(
937+
Organization,
938+
name='testorg',
939+
)
940+
OrganizationOwner.objects.create(
941+
owner=self.user,
942+
organization=self.org,
943+
)
944+
self.org.projects.add(self.pip)
945+
946+
914947
def test_stable_versions(self):
915948
version_post_data = {
916949
'branches': [
@@ -1403,8 +1436,22 @@ class TestLatestVersion(TestCase):
14031436
fixtures = ['eric', 'test_data']
14041437

14051438
def setUp(self):
1406-
self.client.login(username='eric', password='test')
1439+
self.user = User.objects.get(username='eric')
1440+
self.client.force_login(self.user)
14071441
self.pip = Project.objects.get(slug='pip')
1442+
1443+
# Run tests for .com
1444+
if settings.ALLOW_PRIVATE_REPOS:
1445+
self.org = get(
1446+
Organization,
1447+
name='testorg',
1448+
)
1449+
OrganizationOwner.objects.create(
1450+
owner=self.user,
1451+
organization=self.org,
1452+
)
1453+
self.org.projects.add(self.pip)
1454+
14081455
Version.objects.create(
14091456
project=self.pip,
14101457
identifier='origin/master',

0 commit comments

Comments
 (0)