Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix inst test #6185

Merged
merged 2 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions tests/api/endpoints/admin/test_institution_users.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import json
import logging
from mock import patch

from django.urls import reverse

from seahub.test_utils import BaseTestCase
from tests.common.utils import randstring
from seahub.institutions.models import Institution, InstitutionAdmin
from seahub.institutions.models import Institution
from seahub.profile.models import Profile

logger = logging.getLogger(__name__)


Expand All @@ -25,8 +26,11 @@ def _delete_institution(self, name=''):
except Exception as e:
logger.error(e)

@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_get(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

def test_can_get(self):
self.login_as(self.admin)
inst = self._add_institution('int1')
url = reverse('api-v2.1-admin-institution-users', args=[inst.id])
Expand All @@ -38,7 +42,11 @@ def test_can_get(self):

inst.delete()

def test_no_permission(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_no_permission(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.logout()
self.login_as(self.admin_no_other_permission)
inst = self._add_institution('int1')
Expand All @@ -47,7 +55,11 @@ def test_no_permission(self):

self.assertEqual(403, resp.status_code)

def test_can_create(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_create(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
inst = self._add_institution('int1')
url = reverse('api-v2.1-admin-institution-users', args=[inst.id])
Expand Down Expand Up @@ -85,7 +97,11 @@ def _add_user_in_institution(self, email, inst_name):
profile.institution = inst_name
profile.save()

def test_can_update(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_update(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
inst = self._add_institution('int1')
self._add_user_in_institution(self.user.email, inst.name)
Expand All @@ -100,7 +116,11 @@ def test_can_update(self):

inst.delete()

def test_can_delete(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_delete(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
inst = self._add_institution('int1')
self._add_user_in_institution(self.user.email, inst.name)
Expand Down
37 changes: 31 additions & 6 deletions tests/api/endpoints/admin/test_institutions.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import json
import logging
from mock import patch

from django.urls import reverse

from seahub.test_utils import BaseTestCase
from tests.common.utils import randstring
from seahub.institutions.models import Institution

logger = logging.getLogger(__name__)


Expand All @@ -24,7 +26,11 @@ def _delete_institution(self, name=''):
except Exception as e:
logger.error(e)

def test_can_get(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_get(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
inst = self._add_institution('int1')
url = reverse('api-v2.1-admin-institutions')
Expand All @@ -37,7 +43,11 @@ def test_can_get(self):

inst.delete()

def test_no_permission(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_no_permission(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.logout()
self.login_as(self.admin_no_other_permission)
inst = self._add_institution('int1')
Expand All @@ -47,7 +57,11 @@ def test_no_permission(self):
self.assertEqual(403, resp.status_code)
inst.delete()

def test_can_create(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_create(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
url = reverse('api-v2.1-admin-institutions')

Expand Down Expand Up @@ -79,7 +93,11 @@ def _delete_institution(self, name=''):
except Exception as e:
logger.error(e)

def test_can_get(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_get(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
institution_name = randstring(10)
inst = self._add_institution(institution_name)
Expand All @@ -93,7 +111,11 @@ def test_can_get(self):

inst.delete()

def test_can_update(self):
@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_update(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

self.login_as(self.admin)
institution_name = randstring(10)
inst = self._add_institution(institution_name)
Expand All @@ -108,8 +130,11 @@ def test_can_update(self):

inst.delete()

@patch('seahub.api2.permissions.IsProVersion.has_permission')
def test_can_delete(self, mock_is_pro_version):

mock_is_pro_version.return_value = True

def test_can_delete(self):
self.login_as(self.admin)
institution_name = randstring(10)
inst = self._add_institution(institution_name)
Expand Down
Loading