Merge 620ecae into 3c1fff9

kiwitcms · May 2, 2019 · 732127a · 732127a
2 parents 3c1fff9 + 620ecae
commit 732127a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/tcms_tenants/tests/__init__.py b/tcms_tenants/tests/__init__.py
@@ -22,10 +22,17 @@ class Meta:
 
 
 class LoggedInTestCase(TenantTestCase):
+    @classmethod
+    def setup_tenant(cls, tenant):
+        tenant.owner = UserFactory()
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
 
+        # authorize tenant owner
+        cls.tenant.authorized_users.add(cls.tenant.owner)
+
         cls.tester = UserFactory()
         cls.tester.set_password('password')
         cls.tester.save()

diff --git a/tcms_tenants/tests/test_storage.py b/tcms_tenants/tests/test_storage.py
@@ -10,24 +10,36 @@
 from django_tenants.test.cases import TenantTestCase
 
 from tcms_tenants.storage import TenantFileSystemStorage
+from tcms_tenants.tests import UserFactory
 
 
 class TenantFileSystemStorageTestCase(TenantTestCase):
+    @classmethod
+    def setup_tenant(cls, tenant):
+        tenant.owner = UserFactory()
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # authorize tenant owner
+        cls.tenant.authorized_users.add(cls.tenant.owner)
+
     @override_settings(MEDIA_ROOT="apps_dir/media",
                        MEDIA_URL="/media/",
                        MULTITENANT_RELATIVE_MEDIA_ROOT="%s")
     def test_files_are_saved_under_subdirectories_per_tenant(self):
         storage = TenantFileSystemStorage()
 
         connection.set_schema_to_public()
-        tenant1 = utils.get_tenant_model()(schema_name='tenant1')
+        tenant1 = utils.get_tenant_model()(schema_name='tenant1', owner=UserFactory())
         tenant1.save()
 
         domain1 = utils.get_tenant_domain_model()(tenant=tenant1, domain='something.test.com')
         domain1.save()
 
         connection.set_schema_to_public()
-        tenant2 = utils.get_tenant_model()(schema_name='tenant2')
+        tenant2 = utils.get_tenant_model()(schema_name='tenant2', owner=UserFactory())
         tenant2.save()
 
         domain2 = utils.get_tenant_domain_model()(tenant=tenant2, domain='example.com')

diff --git a/tcms_tenants/tests/test_views.py b/tcms_tenants/tests/test_views.py
@@ -14,16 +14,16 @@
 class RedirectToTestCase(LoggedInTestCase):
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
+
         connection.set_schema_to_public()
-        cls.tenant3 = Tenant(schema_name='tenant3')
+        cls.tenant3 = Tenant(schema_name='tenant3', owner=cls.tester)
         cls.tenant3.save()
 
         cls.domain3 = Domain(tenant=cls.tenant3,
                              domain='tenant3.%s' % settings.KIWI_TENANTS_DOMAIN)
         cls.domain3.save()
 
-        super().setUpClass()
-
     def test_redirect_to_tenant_path(self):
         expected_url = 'https://tenant3.%s/plans/search/' % settings.KIWI_TENANTS_DOMAIN
         response = self.client.get(reverse('tcms_tenants:redirect-to',